rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Complete zic patch backout by removing NO_PGPORT workaround.

This commit is contained in:
Bruce Momjian 2005-07-06 21:40:09 +00:00
parent 261ffd03f7
commit 970bb03c3c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/port.h
View File

@ -6,7 +6,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/port.h,v 1.78 2005/07/05 17:24:30 momjian Exp $ * $PostgreSQL: pgsql/src/include/port.h,v 1.79 2005/07/06 21:40:09 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -108,7 +108,7 @@ extern int pg_strncasecmp(const char *s1, const char *s2, size_t n);
extern unsigned char pg_toupper(unsigned char ch); extern unsigned char pg_toupper(unsigned char ch);
extern unsigned char pg_tolower(unsigned char ch); extern unsigned char pg_tolower(unsigned char ch);
#if defined(USE_SNPRINTF) && !defined(NO_PGPORT) #ifdef USE_SNPRINTF
extern int pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args); extern int pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
extern int pg_snprintf(char *str, size_t count, const char *fmt,...) extern int pg_snprintf(char *str, size_t count, const char *fmt,...)
/* This extension allows gcc to check the format string */ /* This extension allows gcc to check the format string */
@ -178,7 +178,7 @@ extern int pclose_check(FILE *stream);
#define TZNAME_GLOBAL _tzname #define TZNAME_GLOBAL _tzname
#endif #endif
#if (defined(WIN32) || defined(__CYGWIN__)) && !defined(NO_PGPORT) #if defined(WIN32) || defined(__CYGWIN__)
/* /*
* Win32 doesn't have reliable rename/unlink during concurrent access, * Win32 doesn't have reliable rename/unlink during concurrent access,
* and we need special code to do symlinks. * and we need special code to do symlinks.
@ -204,11 +204,11 @@ extern int pgsymlink(const char *oldpath, const char *newpath);
#define symlink(oldpath, newpath) pgsymlink(oldpath, newpath) #define symlink(oldpath, newpath) pgsymlink(oldpath, newpath)
#endif #endif
#endif /* defined(WIN32) || defined(__CYGWIN__) && !defined(NO_PGPORT) */ #endif /* defined(WIN32) || defined(__CYGWIN__) */
extern bool rmtree(char *path, bool rmtopdir); extern bool rmtree(char *path, bool rmtopdir);
#if defined(WIN32) && !defined(__CYGWIN__) && !defined(NO_PGPORT) #if defined(WIN32) && !defined(__CYGWIN__)
/* open() replacement to allow delete of held files and passing /* open() replacement to allow delete of held files and passing
* of special options. */ * of special options. */

4
src/timezone/Makefile
View File

@ -4,7 +4,7 @@
# Makefile for the timezone library # Makefile for the timezone library
# IDENTIFICATION # IDENTIFICATION
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.21 2005/07/06 21:04:14 momjian Exp $ # $PostgreSQL: pgsql/src/timezone/Makefile,v 1.22 2005/07/06 21:40:09 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -12,7 +12,7 @@ subdir = src/timezone
top_builddir = ../.. top_builddir = ../..
include $(top_builddir)/src/Makefile.global include $(top_builddir)/src/Makefile.global
override CPPFLAGS := $(CPPFLAGS) -I$(srcdir) -DNO_PGPORT override CPPFLAGS := $(CPPFLAGS)
# files to build into backend # files to build into backend
OBJS= localtime.o strftime.o pgtz.o OBJS= localtime.o strftime.o pgtz.o