From 512d7eab82b07cc98d2d350cc6cc4b50e5cdaf4a Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Thu, 10 Aug 2006 01:35:28 +0000 Subject: [PATCH] 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. --- src/include/c.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/include/c.h b/src/include/c.h index 162f12aba35..abff75c199d 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/c.h,v 1.190.2.2 2006/05/21 20:05:50 tgl Exp $ + * $PostgreSQL: pgsql/src/include/c.h,v 1.190.2.3 2006/08/10 01:35:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -740,6 +740,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