Commit0184c68

committed

Rearrange MSVC errcode hack, fix incorrect _MSC_VER test. Magnus

1 parent878f32f commit0184c68Copy full SHA for 0184c68

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2006, 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.212 2006/10/0303:59:22 momjian Exp $`
	`15`	`+ * $PostgreSQL: pgsql/src/include/c.h,v 1.213 2006/10/0320:33:20 tgl Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -58,8 +58,10 @@`
`58`	`58`	`#include"postgres_ext.h"`
`59`	`59`	`#include"pg_trace.h"`
`60`	`60`
`61`		`-#if defined(__BORLANDC__)\|\| (_MSC_VER>1400)`
	`61`	`+#if defined(__BORLANDC__)\|\| (_MSC_VER >=1400)`
	`62`	`+#defineerrcode __msvc_errcode`
`62`	`63`	`#include<crtdefs.h>`
	`64`	`+#undef errcode`
`63`	`65`	`#endif`
`64`	`66`
`65`	`67`	`#include<stdio.h>`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.60 2006/10/0303:59:22 momjian Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.61 2006/10/0320:33:20 tgl Exp $ */`
`2`	`2`
`3`	`3`	`#if defined(_MSC_VER)\|\| defined(__BORLANDC__)`
`4`	`4`	`#defineWIN32_ONLY_COMPILER`
`@@ -272,9 +272,6 @@ typedef unsigned short mode_t;`
`272`	`272`	`#defineinline __inline`
`273`	`273`	`#define__inline__ __inline`
`274`	`274`
`275`		`-#undef errcode`
`276`		`-#defineerrcode __msvc_errcode`
`277`		`-`
`278`	`275`	`#define_S_IRWXU(_S_IREAD \| _S_IWRITE \| _S_IEXEC)`
`279`	`276`	`#define_S_IXUSR_S_IEXEC`
`280`	`277`	`#define_S_IWUSR_S_IWRITE`

Comments

(0)