Commit77e50a6

committed

Mark PG_MODULE_MAGIC and PG_FUNCTION_INFO_V1 with PGDLLEXPORT

independently from BUILDING_DLL. It is always __declspec(dllexport).

1 parentaa5bec6 commit77e50a6Copy full SHA for 77e50a6

File tree

+17

-9

lines changed

+17

-9

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $PostgreSQL: pgsql/src/include/c.h,v 1.240 2010/02/26 02:01:20 momjian Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/include/c.h,v 1.241 2010/05/27 07:59:48 itagaki Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -784,8 +784,12 @@ extern intvsnprintf(char str, size_t count, const char fmt, va_list args);`
`784`	`784`	`#definememmove(d,s,c)bcopy(s, d, c)`
`785`	`785`	`#endif`
`786`	`786`
	`787`	`+/* no special DLL markers on most ports */`
`787`	`788`	`#ifndefPGDLLIMPORT`
`788`		`-#definePGDLLIMPORT/* no special DLL markers on most ports */`
	`789`	`+#definePGDLLIMPORT`
	`790`	`+#endif`
	`791`	`+#ifndefPGDLLEXPORT`
	`792`	`+#definePGDLLEXPORT`
`789`	`793`	`#endif`
`790`	`794`
`791`	`795`	`/*`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.65 2010/02/26 02:01:20 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.66 2010/05/27 07:59:48 itagaki Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -328,7 +328,7 @@ typedef const Pg_finfo_record (PGFInfoFunction) (void);`
`328`	`328`	`*doesn't hurt to add PGDLLIMPORT in case they don't.`
`329`	`329`	`*/`
`330`	`330`	`#definePG_FUNCTION_INFO_V1(funcname) \`
`331`		`-externPGDLLIMPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \`
	`331`	`+externPGDLLEXPORT const Pg_finfo_record * CppConcat(pg_finfo_,funcname)(void); \`
`332`	`332`	`const Pg_finfo_record * \`
`333`	`333`	`CppConcat(pg_finfo_,funcname) (void) \`
`334`	`334`	`{ \`
`@@ -397,7 +397,7 @@ typedef const Pg_magic_struct (PGModuleMagicFunction) (void);`
`397`	`397`	`#definePG_MAGIC_FUNCTION_NAME_STRING "Pg_magic_func"`
`398`	`398`
`399`	`399`	`#definePG_MODULE_MAGIC \`
`400`		`-externPGDLLIMPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \`
	`400`	`+externPGDLLEXPORT const Pg_magic_struct *PG_MAGIC_FUNCTION_NAME(void); \`
`401`	`401`	`const Pg_magic_struct * \`
`402`	`402`	`PG_MAGIC_FUNCTION_NAME(void) \`
`403`	`403`	`{ \`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.7 2007/07/25 12:22:53 mha Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.8 2010/05/27 07:59:48 itagaki Exp $ */`
`2`	`2`
`3`	`3`	`#include<cygwin/version.h>`
`4`	`4`
`@@ -17,5 +17,6 @@`
`17`	`17`	`#definePGDLLIMPORT __declspec (dllexport)`
`18`	`18`	`#else`
`19`	`19`	`#definePGDLLIMPORT __declspec (dllimport)`
`20`		`-`
`21`	`20`	`#endif`
	`21`	`+`
	`22`	`+#definePGDLLEXPORT __declspec (dllexport)`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.93 2010/02/16 19:26:02 mha Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.94 2010/05/27 07:59:48 itagaki Exp $ */`
`2`	`2`
`3`	`3`	`#if defined(_MSC_VER)\|\| defined(__BORLANDC__)`
`4`	`4`	`#defineWIN32_ONLY_COMPILER`
`@@ -57,9 +57,12 @@`
`57`	`57`	`#else/* not BUILDING_DLL */`
`58`	`58`	`#definePGDLLIMPORT __declspec (dllimport)`
`59`	`59`	`#endif`
`60`		`-#else/* not CYGWIN, not MSVC, not MingW */`
`61`	`60`
	`61`	`+#definePGDLLEXPORT __declspec (dllexport)`
	`62`	`+`
	`63`	`+#else/* not CYGWIN, not MSVC, not MingW */`
`62`	`64`	`#definePGDLLIMPORT`
	`65`	`+#definePGDLLEXPORT`
`63`	`66`	`#endif`
`64`	`67`
`65`	`68`

Comments

(0)