Commit5fde861

committed

Improve STRINGS_H macro test for MSVC extensions.

Add DLLIMPORT for V1 headers, in case Win32 don't export all symbols.

1 parentc1bb287 commit5fde861Copy full SHA for 5fde861

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2005, 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.197 2006/03/03 21:35:46 momjian Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/include/c.h,v 1.198 2006/03/05 04:43:57 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -57,6 +57,8 @@`
`57`	`57`	`#else`
`58`	`58`	`#if defined(_MSC_VER)\|\| defined(__BORLANDC__)`
`59`	`59`	`#defineWIN32_CLIENT_ONLY`
	`60`	`+/* Some use MinGW-generated pg_config.h but MSVC for extensions. */`
	`61`	`+#undef HAVE_STRINGS_H`
`60`	`62`	`#endif`
`61`	`63`	`#endif`
`62`	`64`	`#include"postgres_ext.h"`
`@@ -66,8 +68,7 @@`
`66`	`68`	`#include<string.h>`
`67`	`69`	`#include<stddef.h>`
`68`	`70`	`#include<stdarg.h>`
`69`		`-/* Some use MinGW-generated pg_config.h but MSVC for extensions. */`
`70`		`-#if defined(HAVE_STRINGS_H)&& !defined(WIN32_CLIENT_ONLY)`
	`71`	`+#ifdefHAVE_STRINGS_H`
`71`	`72`	`#include<strings.h>`
`72`	`73`	`#endif`
`73`	`74`	`#include<sys/types.h>`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2005, 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.40 2005/10/15 02:49:41 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.41 2006/03/05 04:43:57 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -293,10 +293,13 @@ typedef struct`
`293`	`293`	`/* Expected signature of an info function */`
`294`	`294`	`typedefPg_finfo_record(PGFInfoFunction) (void);`
`295`	`295`
`296`		`-/* Macro to build an info function associated with the given function name */`
`297`		`-`
	`296`	`+/*`
	`297`	`+ *Macro to build an info function associated with the given function name.`
	`298`	`+ *Win32 loadable functions usually link with 'dlltool --export-all', but it`
	`299`	`+ *doesn't hurt to add DLLIMPORT in case they don't.`
	`300`	`+ */`
`298`	`301`	`#definePG_FUNCTION_INFO_V1(funcname) \`
`299`		`-extern Pg_finfo_record * CppConcat(pg_finfo_,funcname) (void); \`
	`302`	`+externDLLIMPORTPg_finfo_record * CppConcat(pg_finfo_,funcname) (void); \`
`300`	`303`	`Pg_finfo_record * \`
`301`	`304`	`CppConcat(pg_finfo_,funcname) (void) \`
`302`	`305`	`{ \`

Comments

(0)