mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-30 19:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange MSVC errcode hack, fix incorrect _MSC_VER test. Magnus

Browse Source
This commit is contained in:
Tom Lane 2006-10-03 20:33:20 +00:00
parent 878f32feab
commit 0184c6835c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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.212 2006/10/03 03:59:22 momjian Exp $ * $PostgreSQL: pgsql/src/include/c.h,v 1.213 2006/10/03 20:33:20 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -58,8 +58,10 @@
#include "postgres_ext.h" #include "postgres_ext.h"
#include "pg_trace.h" #include "pg_trace.h"
#if defined(__BORLANDC__) || (_MSC_VER > 1400) #if defined(__BORLANDC__) || (_MSC_VER >= 1400)
#define errcode __msvc_errcode
#include <crtdefs.h> #include <crtdefs.h>
#undef errcode
#endif #endif
#include <stdio.h> #include <stdio.h>

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

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.60 2006/10/03 03:59:22 momjian Exp $ */ /* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.61 2006/10/03 20:33:20 tgl Exp $ */
#if defined(_MSC_VER) || defined(__BORLANDC__) #if defined(_MSC_VER) || defined(__BORLANDC__)
#define WIN32_ONLY_COMPILER #define WIN32_ONLY_COMPILER
@ -272,9 +272,6 @@ typedef unsigned short mode_t;
#define inline __inline #define inline __inline
#define __inline__ __inline #define __inline__ __inline
#undef errcode
#define errcode __msvc_errcode
#define _S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC) #define _S_IRWXU (_S_IREAD | _S_IWRITE | _S_IEXEC)
#define _S_IXUSR _S_IEXEC #define _S_IXUSR _S_IEXEC
#define _S_IWUSR _S_IWRITE #define _S_IWUSR _S_IWRITE