Rearrange MSVC errcode hack, fix incorrect _MSC_VER test. Magnus

[postgresql] / src / include / c.h

diff --git a/src/include/c.h b/src/include/c.h
index 2b51e2ac0a77fca67023918cdbbb38d56d2d1090..db9983b4624d38688e13daae1ca58d53755476b4 100644 (file)
--- 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.205 2006/06/26 23:53:14 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/c.h,v 1.213 2006/10/03 20:33:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,9 +56,12 @@
 #include "pg_config_os.h"              /* must be before any system header files */
 #endif
 #include "postgres_ext.h"
+#include "pg_trace.h"
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define        WIN32_ONLY_COMPILER
+#if defined(__BORLANDC__) || (_MSC_VER >= 1400)
+#define errcode __msvc_errcode
+#include <crtdefs.h>
+#undef errcode
 #endif
 
 #include <stdio.h>