WSATYPE_NOT_FOUND was already defined for BCC so don't redefine it

bmomjian · bmomjian · commit 64e0d3213331 · 2007-11-21T23:13:36.000Z
(conflicting values).
diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 2003-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.23 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.24 2007/11/21 23:13:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,8 +44,10 @@
 #ifndef WSA_NOT_ENOUGH_MEMORY
 #define WSA_NOT_ENOUGH_MEMORY	(WSAENOBUFS)
 #endif
+#ifndef __BORLANDC__
 #define WSATYPE_NOT_FOUND		(WSABASEERR+109)
 #endif
+#endif
 #define EAI_AGAIN		WSATRY_AGAIN
 #define EAI_BADFLAGS	WSAEINVAL
 #define EAI_FAIL		WSANO_RECOVERY

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`* Copyright (c) 2003-2007, PostgreSQL Global Development Group`
`17`	`17`	`*`
`18`		`- * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.23 2007/01/05 22:19:50 momjian Exp $`
	`18`	`+ * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.24 2007/11/21 23:13:36 momjian Exp $`
`19`	`19`	`*`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`@@ -44,8 +44,10 @@`
`44`	`44`	`#ifndef WSA_NOT_ENOUGH_MEMORY`
`45`	`45`	`#define WSA_NOT_ENOUGH_MEMORY (WSAENOBUFS)`
`46`	`46`	`#endif`
	`47`	`+#ifndef __BORLANDC__`
`47`	`48`	`#define WSATYPE_NOT_FOUND (WSABASEERR+109)`
`48`	`49`	`#endif`
	`50`	`+#endif`
`49`	`51`	`#define EAI_AGAIN WSATRY_AGAIN`
`50`	`52`	`#define EAI_BADFLAGS WSAEINVAL`
`51`	`53`	`#define EAI_FAIL WSANO_RECOVERY`