diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-08-10 01:45:17 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-08-10 01:45:17 +0000 |
| commit | b6f564c012e8f9eb865ae85de80003a88608f1d3 (patch) | |
| tree | 0a28fd22c5399377f985d9b34907afe1678a771b | |
| parent | 512d7eab82b07cc98d2d350cc6cc4b50e5cdaf4a (diff) | |
| download | postgresql-b6f564c012e8f9eb865ae85de80003a88608f1d3.tar.gz postgresql-b6f564c012e8f9eb865ae85de80003a88608f1d3.zip | |
Move Win32 inline define to win32.h so it is found, rather than c.h.
(cleaner)
| -rw-r--r-- | src/include/c.h | 13 | ||||
| -rw-r--r-- | src/include/port/win32.h | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/include/c.h b/src/include/c.h index abff75c199d..38af69efd6d 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.3 2006/08/10 01:35:28 momjian Exp $ + * $PostgreSQL: pgsql/src/include/c.h,v 1.190.2.4 2006/08/10 01:45:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -740,17 +740,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 5bf6ce208fc..93d6e2a74c3 100644 --- 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.49 2005/10/25 15:15:16 tgl Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.49.2.1 2006/08/10 01:45:17 momjian Exp $ */ /* undefine and redefine after #include */ #undef mkdir @@ -181,6 +181,17 @@ typedef long key_t; typedef int pid_t; #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 + /* * Supplement to <sys/stat.h>. */ |