sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-04 00:02:37 -04:00
Code Issues Projects Releases Wiki Activity

Return inline to win32.h because code was OK, but keep additional

Browse Source 
comment.  8.1.X is not affected by this commit.
This commit is contained in:
Bruce Momjian 2006-08-10 01:41:29 +00:00
parent 3929b6e9f6
commit e860e746e1
2 changed files with 11 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-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2006, 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.210 2006/08/10 01:35:21 momjian Exp $ * $PostgreSQL: pgsql/src/include/c.h,v 1.211 2006/08/10 01:41:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -744,17 +744,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

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

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.57 2006/08/10 01:35:21 momjian Exp $ */ /* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.58 2006/08/10 01:41:29 momjian Exp $ */
/* undefine and redefine after #include */ /* undefine and redefine after #include */
#undef mkdir #undef mkdir
@ -259,6 +259,15 @@ extern void _dosmaperr(unsigned long);
typedef long ssize_t; typedef long ssize_t;
typedef unsigned short mode_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 #undef errcode
#define errcode __vc_errcode #define errcode __vc_errcode