Rearrange MSVC errcode hack, fix incorrect _MSC_VER test. Magnus

tglsfdc · tglsfdc · commit 0184c6835cb9 · 2006-10-03T20:33:20.000Z
diff --git a/src/include/c.h b/src/include/c.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/c.h,v 1.212 2006/10/03 03:59:22 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/c.h,v 1.213 2006/10/03 20:33:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,8 +58,10 @@
 #include "postgres_ext.h"
 #include "pg_trace.h"
 
-#if defined(__BORLANDC__) || (_MSC_VER > 1400)
+#if defined(__BORLANDC__) || (_MSC_VER >= 1400)
+#define errcode __msvc_errcode
 #include <crtdefs.h>
+#undef errcode
 #endif
 
 #include <stdio.h>
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.60 2006/10/03 03:59:22 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.61 2006/10/03 20:33:20 tgl Exp $ */
 
 #if defined(_MSC_VER) || defined(__BORLANDC__)
 #define	WIN32_ONLY_COMPILER
@@ -272,9 +272,6 @@ typedef unsigned short mode_t;
 #define inline __inline
 #define __inline__ __inline
 
-#undef errcode
-#define errcode __msvc_errcode
-
 #define _S_IRWXU	(_S_IREAD | _S_IWRITE | _S_IEXEC)
 #define _S_IXUSR	_S_IEXEC
 #define _S_IWUSR	_S_IWRITE
