Rearrange MSVC errcode hack, fix incorrect _MSC_VER test. Magnus

[postgresql] / src / include / port / win32.h

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index e6057093cc4f8ed2d51b007fb05867ca7cad88b0..f5e17aae3ecb285aec816e949b1acd78e980eb15 100644 (file)
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,4 +1,8 @@
-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.55 2006/08/08 18:49:14 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
+#endif
 
 /* undefine and redefine after #include */
 #undef mkdir
@@ -162,7 +166,7 @@ struct itimerval
        struct timeval it_interval;
        struct timeval it_value;
 };
-int                    setitimer(int which, const struct itimerval * value, struct itimerval * ovalue);
+int                    setitimer(int which, const struct itimerval *value, struct itimerval *ovalue);
 
 
 /*
@@ -259,12 +263,15 @@ extern void _dosmaperr(unsigned long);
 typedef long ssize_t;
 typedef unsigned short mode_t;
 
+/*
+ *     Certain "standard edition" versions of MSVC throw a warning
+ *     that later generates an error for "inline" statements, but
+ *     __inline seems to work.  e.g.  Microsoft Visual C++ .NET
+ *     Version 7.1.3088
+ */
 #define inline __inline
 #define __inline__ __inline
 
-#undef errcode
-#define errcode __vc_errcode
-
 #define _S_IRWXU       (_S_IREAD | _S_IWRITE | _S_IEXEC)
 #define _S_IXUSR       _S_IEXEC
 #define _S_IWUSR       _S_IWRITE