Commit4f979e8

committed

Restructure zic #define fprintf checks to use a NO_PGPORT macro instead.

1 parent8a79451 commit4f979e8Copy full SHA for 4f979e8

File tree

-15

lines changed

-15

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/port.h,v 1.76 2005/06/27 02:04:25 neilc Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/port.h,v 1.77 2005/07/04 19:54:51 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -108,7 +108,7 @@ extern intpg_strncasecmp(const char s1, const char s2, size_t n);`
`108`	`108`	`externunsignedcharpg_toupper(unsignedcharch);`
`109`	`109`	`externunsignedcharpg_tolower(unsignedcharch);`
`110`	`110`
`111`		`-#ifdefUSE_SNPRINTF`
	`111`	`+#if defined(USE_SNPRINTF)&& !defined(NO_PGPORT)`
`112`	`112`	`externintpg_vsnprintf(charstr,size_tcount,constcharfmt,va_listargs);`
`113`	`113`	`externintpg_snprintf(charstr,size_tcount,constcharfmt,...)`
`114`	`114`	`/* This extension allows gcc to check the format string */`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,15 @@`
`4`	`4`	`# Makefile for the timezone library`
`5`	`5`
`6`	`6`	`# IDENTIFICATION`
`7`		`-# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.19 2005/07/0402:55:59 neilc Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.20 2005/07/0419:54:51 momjian Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`11`	`11`	`subdir = src/timezone`
`12`	`12`	`top_builddir = ../..`
`13`	`13`	`include$(top_builddir)/src/Makefile.global`
`14`	`14`
`15`		`-overrideCPPFLAGS :=$(CPPFLAGS) -I$(srcdir)`
	`15`	`+overrideCPPFLAGS :=$(CPPFLAGS) -I$(srcdir) -DNO_PGPORT`
`16`	`16`
`17`	`17`	`# files to build into backend`
`18`	`18`	`OBJS= localtime.o strftime.o pgtz.o`

Lines changed: 1 addition & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/timezone/pgtz.h,v 1.13 2005/07/0418:21:40 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/timezone/pgtz.h,v 1.14 2005/07/0419:54:51 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -18,16 +18,6 @@`
`18`	`18`
`19`	`19`	`#include"tzfile.h"`
`20`	`20`
`21`		`-/*`
`22`		`- *Prevent the use of /port functions because`
`23`		`- *the are not included in this binary.`
`24`		`- */`
`25`		`-#undef vsnprintf`
`26`		`-#undef snprintf`
`27`		`-#undef sprintf`
`28`		`-#undef fprintf`
`29`		`-#undef printf`
`30`		`-`
`31`	`21`	`externchar*pg_TZDIR(void);`
`32`	`22`
`33`	`23`	`#defineBIGGEST(a,b)(((a) > (b)) ? (a) : (b))`

Comments

(0)