Move "#define inline __inline" from port/win32.h to c.h because Win32

interface builds like libpq need it.

Backpatch addition to 8.1.X.

diff --git a/src/include/c.h b/src/include/c.h
index 55da238dc1c12fe92fb56da9717aaf4517194e7d..b3551c1819867e23ff8e3de5f69c953a31c79aa1 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -744,6 +744,17 @@ 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 a121ee965cf07e6816782880f93ab94e9ac14aaf..b746defe0da75c0d0af8ec576ed4469e657df369 100644 (file)
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -259,9 +259,6 @@ extern void _dosmaperr(unsigned long);
 typedef long ssize_t;
 typedef unsigned short mode_t;
 
-#define inline __inline
-#define __inline__ __inline
-
 #undef errcode
 #define errcode __vc_errcode