NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit9c14dd2

committed

Define WIN32 when _WIN32 is set

_WIN32 is set by the compiler, whereas our code uses WIN32 that isnormally set through our build system. To make it possible to buildextensions out of tree we cannot rely on that, so set the WIN32symbol explicitly whenever the compiler has set _WIN32.Not setting this symbol causes double inclusion of pg_config_os.h,and possibly other errors as well.Craig Ringer

1 parent2772799 commit9c14dd2Copy full SHA for 9c14dd2

File tree

1 file changed

-0

lines changed

src/include
- c.h

1 file changed

-0

lines changed

`‎src/include/c.h`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,15 @@`
`53`	`53`	`#include"pg_config.h"`
`54`	`54`	`#include"pg_config_manual.h"/* must be after pg_config.h */`
`55`	`55`
	`56`	`+/*`
	`57`	`+ * We always rely on the WIN32 macro being set by our build system,`
	`58`	`+ * but _WIN32 is the compiler pre-defined macro. So make sure we define`
	`59`	`+ * WIN32 whenever _WIN32 is set, to facilitate standalone building.`
	`60`	`+ */`
	`61`	`+#if defined(_WIN32)`
	`62`	`+#defineWIN32`
	`63`	`+#endif`
	`64`	`+`
`56`	`65`	`#if !defined(WIN32)&& !defined(__CYGWIN__)/* win32 includes further down */`
`57`	`66`	`#include"pg_config_os.h"/* must be before any system header files */`
`58`	`67`	`#endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9c14dd2

File tree

1 file changed

1 file changed

`‎src/include/c.h`

0 commit comments