mirror of
https://github.com/postgres/postgres.git
synced 2025-05-28 05:21:27 +03:00
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.
This commit is contained in:
parent
a42c545f62
commit
512d7eab82
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user