Mark PG_MODULE_MAGIC and PG_FUNCTION_INFO_V1 with PGDLLEXPORT
independently from BUILDING_DLL. It is always __declspec(dllexport).
This commit is contained in:
parent
aa5bec67de
commit
77e50a61ff
|
@ -12,7 +12,7 @@
|
|||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/c.h,v 1.240 2010/02/26 02:01:20 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/include/c.h,v 1.241 2010/05/27 07:59:48 itagaki Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
@ -784,8 +784,12 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list args);
|
|||
#define memmove(d, s, c) bcopy(s, d, c)
|
||||
#endif
|
||||
|
||||
/* no special DLL markers on most ports */
|
||||
#ifndef PGDLLIMPORT
|
||||
#define PGDLLIMPORT /* no special DLL markers on most ports */
|
||||
#define PGDLLIMPORT
|
||||
#endif
|
||||
#ifndef PGDLLEXPORT
|
||||
#define PGDLLEXPORT
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/fmgr.h,v 1.65 2010/02/26 02:01:20 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/include/fmgr.h,v 1.66 2010/05/27 07:59:48 itagaki Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
@ -328,7 +328,7 @@ typedef const Pg_finfo_record *(*PGFInfoFunction) (void);
|
|||
* doesn't hurt to add PGDLLIMPORT in case they don't.
|
||||
*/
|
||||
#define PG_FUNCTION_INFO_V1(funcname) \
|
||||
extern PGDLLIMPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
|
||||
extern PGDLLEXPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \
|
||||
const Pg_finfo_record * \
|
||||
CppConcat(pg_finfo_,funcname) (void) \
|
||||
{ \
|
||||
|
@ -397,7 +397,7 @@ typedef const Pg_magic_struct *(*PGModuleMagicFunction) (void);
|
|||
#define PG_MAGIC_FUNCTION_NAME_STRING "Pg_magic_func"
|
||||
|
||||
#define PG_MODULE_MAGIC \
|
||||
extern PGDLLIMPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \
|
||||
extern PGDLLEXPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \
|
||||
const Pg_magic_struct * \
|
||||
PG_MAGIC_FUNCTION_NAME(void) \
|
||||
{ \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.7 2007/07/25 12:22:53 mha Exp $ */
|
||||
/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.8 2010/05/27 07:59:48 itagaki Exp $ */
|
||||
|
||||
#include <cygwin/version.h>
|
||||
|
||||
|
@ -17,5 +17,6 @@
|
|||
#define PGDLLIMPORT __declspec (dllexport)
|
||||
#else
|
||||
#define PGDLLIMPORT __declspec (dllimport)
|
||||
|
||||
#endif
|
||||
|
||||
#define PGDLLEXPORT __declspec (dllexport)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.93 2010/02/16 19:26:02 mha Exp $ */
|
||||
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.94 2010/05/27 07:59:48 itagaki Exp $ */
|
||||
|
||||
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
||||
#define WIN32_ONLY_COMPILER
|
||||
|
@ -57,9 +57,12 @@
|
|||
#else /* not BUILDING_DLL */
|
||||
#define PGDLLIMPORT __declspec (dllimport)
|
||||
#endif
|
||||
#else /* not CYGWIN, not MSVC, not MingW */
|
||||
|
||||
#define PGDLLEXPORT __declspec (dllexport)
|
||||
|
||||
#else /* not CYGWIN, not MSVC, not MingW */
|
||||
#define PGDLLIMPORT
|
||||
#define PGDLLEXPORT
|
||||
#endif
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue