From d82a194dafd084eb91d7abffa3ed2e9a33e7c4b6 Mon Sep 17 00:00:00 2001 From: short <> Date: Thu, 19 Apr 2001 18:13:56 +0000 Subject: [PATCH] Crossplatformity: '#ifndef DONT_NEED_DECLARATIONS' -> '#ifdef WANT_DECLARATIONS' otherwise included libintl has problems (conflicts) with provided declarations --- acconfig.h | 8 ++++---- manfmt.c | 1 + mdsms.1.c | 2 +- mdsms.c | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/acconfig.h b/acconfig.h index 912a31e..a366e48 100644 --- a/acconfig.h +++ b/acconfig.h @@ -74,7 +74,7 @@ @BOTTOM@ -#ifndef DONT_NEED_DECLARATIONS +#ifdef WANT_DECLARATIONS /* Declaration for gethostname(3)? */ #undef NEED_DECLARATION_GETHOSTNAME @@ -181,7 +181,7 @@ int pclose(FILE *stream); extern const char *gettext(const char *msgid); #endif -#endif /* !DONT_NEED_DECLARATIONS */ +#endif /* WANT_DECLARATIONS */ /* snprintf(3) unsafe emulation */ #ifdef HAVE_SNPRINTF @@ -226,7 +226,7 @@ extern char *sys_errlist[]; #define offsetof(a,b) ((size_t)&((a *)0)->b) #endif -#ifndef DONT_NEED_DECLARATIONS +#ifdef WANT_DECLARATIONS /* * Handles all of the internationalization configuration options. * Author: Tom Tromey @@ -253,4 +253,4 @@ extern char *sys_errlist[]; # define _(String) (String) # define N_(String) (String) #endif /* ENABLE_NLS */ -#endif /* !DONT_NEED_DECLARATIONS */ +#endif /* WANT_DECLARATIONS */ diff --git a/manfmt.c b/manfmt.c index 03b8303..1c6eedd 100644 --- a/manfmt.c +++ b/manfmt.c @@ -1,3 +1,4 @@ +#define WANT_DECLARATIONS 1 #include "config.h" #ifndef lint static char rcsid[] ATTR_UNUSED = "$Id$"; diff --git a/mdsms.1.c b/mdsms.1.c index 8ccf30d..0694489 100644 --- a/mdsms.1.c +++ b/mdsms.1.c @@ -2,7 +2,7 @@ * $Id$ */ -#define DONT_NEED_DECLARATIONS 1 +/* NEVER define "WANT_DECLARATIONS" ! */ #include "config.h" #include "setup.h" #include "mdsms.1.in2" diff --git a/mdsms.c b/mdsms.c index e2b173f..21d6999 100644 --- a/mdsms.c +++ b/mdsms.c @@ -1,3 +1,4 @@ +#define WANT_DECLARATIONS 1 #include "config.h" #ifndef lint static char rcsid[] ATTR_UNUSED = "$Id$"; -- 1.8.3.1