Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit970bb03

Browse files
committed
Complete zic patch backout by removing NO_PGPORT workaround.
1 parent261ffd0 commit970bb03

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

‎src/include/port.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/port.h,v 1.78 2005/07/05 17:24:30 momjian Exp $
9+
* $PostgreSQL: pgsql/src/include/port.h,v 1.79 2005/07/06 21:40:09 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -108,7 +108,7 @@ extern intpg_strncasecmp(const char *s1, const char *s2, size_t n);
108108
externunsignedcharpg_toupper(unsignedcharch);
109109
externunsignedcharpg_tolower(unsignedcharch);
110110

111-
#if defined(USE_SNPRINTF)&& !defined(NO_PGPORT)
111+
#ifdefUSE_SNPRINTF
112112
externintpg_vsnprintf(char*str,size_tcount,constchar*fmt,va_listargs);
113113
externintpg_snprintf(char*str,size_tcount,constchar*fmt,...)
114114
/* This extension allows gcc to check the format string */
@@ -178,7 +178,7 @@ extern intpclose_check(FILE *stream);
178178
#defineTZNAME_GLOBAL _tzname
179179
#endif
180180

181-
#if(defined(WIN32)|| defined(__CYGWIN__))&& !defined(NO_PGPORT)
181+
#if defined(WIN32)|| defined(__CYGWIN__)
182182
/*
183183
*Win32 doesn't have reliable rename/unlink during concurrent access,
184184
*and we need special code to do symlinks.
@@ -204,11 +204,11 @@ extern intpgsymlink(const char *oldpath, const char *newpath);
204204
#definesymlink(oldpath,newpath)pgsymlink(oldpath, newpath)
205205
#endif
206206

207-
#endif/* defined(WIN32) || defined(__CYGWIN__)&& !defined(NO_PGPORT)*/
207+
#endif/* defined(WIN32) || defined(__CYGWIN__) */
208208

209209
externboolrmtree(char*path,boolrmtopdir);
210210

211-
#if defined(WIN32)&& !defined(__CYGWIN__)&& !defined(NO_PGPORT)
211+
#if defined(WIN32)&& !defined(__CYGWIN__)
212212

213213
/* open() replacement to allow delete of held files and passing
214214
* of special options. */

‎src/timezone/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# Makefile for the timezone library
55

66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.21 2005/07/06 21:04:14 momjian Exp $
7+
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.22 2005/07/06 21:40:09 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
subdir = src/timezone
1212
top_builddir = ../..
1313
include$(top_builddir)/src/Makefile.global
1414

15-
overrideCPPFLAGS :=$(CPPFLAGS) -I$(srcdir) -DNO_PGPORT
15+
overrideCPPFLAGS :=$(CPPFLAGS)
1616

1717
# files to build into backend
1818
OBJS= localtime.o strftime.o pgtz.o

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp