From 4d49a0e99b987127cffb871af35235433b4a60de Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 10 Aug 2006 01:41:29 +0000 Subject: [PATCH] Return inline to win32.h because code was OK, but keep additional comment. 8.1.X is not affected by this commit. --- src/include/c.h | 11 ----------- src/include/port/win32.h | 9 +++++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/include/c.h b/src/include/c.h index b3551c1819..55da238dc1 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -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 #endif diff --git a/src/include/port/win32.h b/src/include/port/win32.h index b746defe0d..6c6f48ef4d 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -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 -- 2.39.5