Return inline to win32.h because code was OK, but keep additional

comment.  8.1.X is not affected by this commit.

diff --git a/src/include/c.h b/src/include/c.h
index 7e7cce8dadc69e4512a16ab0e924a3496d294a6c..0feedf69ee35effea912ee1861dbe0c6571b4406 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.210 2006/08/10 01:35:21 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/c.h,v 1.211 2006/08/10 01:41:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -744,17 +744,6 @@ typedef NameData *Name;
 #define PG_BINARY_W "w"
 #endif
 
-#ifdef MSVC
-/*
- *     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
-#endif
-
 #if defined(sun) && defined(__sparc__) && !defined(__SVR4)
 #include <unistd.h>
 #endif

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index e50e965461595ae4d857c3e397e9d71e30e1f154..d90f8a7d956eb0be453611754cf6c3a404be13b6 100644 (file)
--- 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.57 2006/08/10 01:35:21 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.58 2006/08/10 01:41:29 momjian Exp $ */
 
 /* undefine and redefine after #include */
 #undef mkdir
@@ -259,6 +259,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