NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit0b71596

committed

This fixes clashing defines of ERROR. On win32, winapi.h is included, which

includes windows.h, which #defines ERROR to 0. PostgreSQL's logging functionsdefine ERROR to -1. This patch redefines ERROR to -1 to avoid current orfuture breakage of the logging functions.Gerhard H?ring

1 parente9f5463 commit0b71596Copy full SHA for 0b71596

File tree

1 file changed

-1

lines changed

src/include/libpq
- pqcomm.h

1 file changed

-1

lines changed

`‎src/include/libpq/pqcomm.h`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`10`	`10`	`* Portions Copyright (c) 1994, Regents of the University of California`
`11`	`11`	`*`
`12`		`- * $Id: pqcomm.h,v 1.58 2001/08/21 00:33:27 momjian Exp $`
	`12`	`+ * $Id: pqcomm.h,v 1.59 2001/09/06 03:18:12 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -19,6 +19,11 @@`
`19`	`19`	`#include<sys/types.h>`
`20`	`20`	`#ifdefWIN32`
`21`	`21`	`#include<winsock.h>`
	`22`	`+/* workaround for clashing defines of "ERROR" */`
	`23`	`+#ifdefELOG_H`
	`24`	`+#undef ERROR`
	`25`	`+#defineERROR(-1)`
	`26`	`+#endif`
`22`	`27`	`#else/* not WIN32 */`
`23`	`28`	`#include<sys/socket.h>`
`24`	`29`	`#ifdefHAVE_SYS_UN_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!

Commit0b71596

File tree

1 file changed

1 file changed

`‎src/include/libpq/pqcomm.h`

0 commit comments