Restructure zic #define fprintf checks to use a NO_PGPORT macro instead.
This commit is contained in:
parent
8a79451152
commit
4f979e8bac
@ -6,7 +6,7 @@
|
||||
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/include/port.h,v 1.76 2005/06/27 02:04:25 neilc Exp $
|
||||
* $PostgreSQL: pgsql/src/include/port.h,v 1.77 2005/07/04 19:54:51 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_tolower(unsigned char ch);
|
||||
|
||||
#ifdef USE_SNPRINTF
|
||||
#if defined(USE_SNPRINTF) && !defined(NO_PGPORT)
|
||||
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,...)
|
||||
/* This extension allows gcc to check the format string */
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Makefile for the timezone library
|
||||
|
||||
# IDENTIFICATION
|
||||
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.19 2005/07/04 02:55:59 neilc Exp $
|
||||
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.20 2005/07/04 19:54:51 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
@ -12,7 +12,7 @@ subdir = src/timezone
|
||||
top_builddir = ../..
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
override CPPFLAGS := $(CPPFLAGS) -I$(srcdir)
|
||||
override CPPFLAGS := $(CPPFLAGS) -I$(srcdir) -DNO_PGPORT
|
||||
|
||||
# files to build into backend
|
||||
OBJS= localtime.o strftime.o pgtz.o
|
||||
|
@ -9,7 +9,7 @@
|
||||
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/timezone/pgtz.h,v 1.13 2005/07/04 18:21:40 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/timezone/pgtz.h,v 1.14 2005/07/04 19:54:51 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -18,16 +18,6 @@
|
||||
|
||||
#include "tzfile.h"
|
||||
|
||||
/*
|
||||
* Prevent the use of /port functions because
|
||||
* the are not included in this binary.
|
||||
*/
|
||||
#undef vsnprintf
|
||||
#undef snprintf
|
||||
#undef sprintf
|
||||
#undef fprintf
|
||||
#undef printf
|
||||
|
||||
extern char *pg_TZDIR(void);
|
||||
|
||||
#define BIGGEST(a, b) (((a) > (b)) ? (a) : (b))
|
||||
|
Loading…
x
Reference in New Issue
Block a user