NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit808849e

committed

Fix lack of repeat-inclusion guard in win32 substitute sys/socket.h.

I think this explains the 'implicit declaration of function gai_strerror'warnings visible in the current buildfarm report from snake: ifsys/socket.h is included again after getaddrinfo.h, the file wouldmerrily undefine the gai_strerror macro.

1 parent3ff58b4 commit808849eCopy full SHA for 808849e

File tree

1 file changed

-1

lines changed

src/include/port/win32/sys
- socket.h

1 file changed

-1

lines changed

`‎src/include/port/win32/sys/socket.h`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,9 @@`
	`1`	`+/*`
	`2`	`+ * $PostgreSQL: pgsql/src/include/port/win32/sys/socket.h,v 1.6 2006/07/16 01:35:28 tgl Exp $`
	`3`	`+ */`
	`4`	`+#ifndefWIN32_SYS_SOCKET_H`
	`5`	`+#defineWIN32_SYS_SOCKET_H`
	`6`	`+`
`1`	`7`	`/*`
`2`	`8`	`* Unfortunately, <wingdi.h> of VC++ also defines ERROR.`
`3`	`9`	`* To avoid the conflict, we include <windows.h> here and undefine ERROR`
`@@ -7,12 +13,14 @@`
`7`	`13`	`*/`
`8`	`14`	`#include<winsock2.h>`
`9`	`15`	`#include<ws2tcpip.h>`
	`16`	`+`
`10`	`17`	`#undef ERROR`
`11`	`18`	`#undef small`
`12`	`19`
`13`	`20`	`/* Restore old ERROR value */`
`14`	`21`	`#ifdefPGERROR`
`15`	`22`	`#defineERROR PGERROR`
	`23`	`+#endif`
`16`	`24`
`17`	`25`	`/*`
`18`	`26`	`* we can't use the windows gai_strerror{AW} functions because`
`@@ -21,4 +29,4 @@`
`21`	`29`	`*/`
`22`	`30`	`#undef gai_strerror`
`23`	`31`
`24`		`-#endif`
	`32`	`+#endif/* WIN32_SYS_SOCKET_H */`

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!

Commit808849e

File tree

1 file changed

1 file changed

`‎src/include/port/win32/sys/socket.h`

0 commit comments