database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-28 05:21:27 +03:00
Code

Move Win32 inline define to win32.h so it is found, rather than c.h.

Browse Source 
(cleaner)
This commit is contained in:
Bruce Momjian 2006-08-10 01:45:17 +00:00
parent 512d7eab82
commit b6f564c012
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/include/c.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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" #define PG_BINARY_W "w"
#endif #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) #if defined(sun) && defined(__sparc__) && !defined(__SVR4)
#include <unistd.h> #include <unistd.h>
#endif #endif

13
src/include/port/win32.h
View File

@ -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 */ /* undefine and redefine after #include */
#undef mkdir #undef mkdir
@ -181,6 +181,17 @@ typedef long key_t;
typedef int pid_t; typedef int pid_t;
#endif #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>. * Supplement to <sys/stat.h>.
*/ */