From: Tom Lane Date: Tue, 6 Dec 2005 05:13:56 +0000 (+0000) Subject: Put undef's before extern declarations that need 'em, per Andrew Dunstan. X-Git-Tag: REL8_1_1~36 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24bc418969ff5b9f0ee7dbff86cf35211e5126f4;p=postgresql Put undef's before extern declarations that need 'em, per Andrew Dunstan. --- diff --git a/src/include/port.h b/src/include/port.h index bba92d4481..9de96f1eaf 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -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.84.2.1 2005/12/06 02:29:26 tgl Exp $ + * $PostgreSQL: pgsql/src/include/port.h,v 1.84.2.2 2005/12/06 05:13:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -114,24 +114,6 @@ extern unsigned char pg_tolower(unsigned char ch); #ifdef USE_REPL_SNPRINTF -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 */ -__attribute__((format(printf, 3, 4))); -extern int -pg_sprintf(char *str, const char *fmt,...) -/* This extension allows gcc to check the format string */ -__attribute__((format(printf, 2, 3))); -extern int -pg_fprintf(FILE *stream, const char *fmt,...) -/* This extension allows gcc to check the format string */ -__attribute__((format(printf, 2, 3))); -extern int -pg_printf(const char *fmt,...) -/* This extension allows gcc to check the format string */ -__attribute__((format(printf, 1, 2))); - /* * Some versions of libintl try to replace printf and friends with macros; * if we are doing likewise, make sure our versions win. @@ -152,6 +134,24 @@ __attribute__((format(printf, 1, 2))); #undef printf #endif +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 */ +__attribute__((format(printf, 3, 4))); +extern int +pg_sprintf(char *str, const char *fmt,...) +/* This extension allows gcc to check the format string */ +__attribute__((format(printf, 2, 3))); +extern int +pg_fprintf(FILE *stream, const char *fmt,...) +/* This extension allows gcc to check the format string */ +__attribute__((format(printf, 2, 3))); +extern int +pg_printf(const char *fmt,...) +/* This extension allows gcc to check the format string */ +__attribute__((format(printf, 1, 2))); + /* * The GCC-specific code below prevents the __attribute__(... 'printf') * above from being replaced, and this is required because gcc doesn't