From 5de42b94d1ca07655d8ef705ac972890d3c44774 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Sat, 10 Feb 2001 00:25:59 +0000 Subject: [PATCH] Fix for K&R cpp. (HAVE_PWD_H, HAVE_SYS_IOCTL_H, HAVE_ULIMIT_H): New. (getenv): Move declaration and prototype it. --- src/config.in | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/config.in b/src/config.in index d462b75425b..77c090af6d8 100644 --- a/src/config.in +++ b/src/config.in @@ -1,5 +1,5 @@ /* GNU Emacs site configuration template file. -*- C -*- - Copyright (C) 1988, 1993, 1994, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -182,6 +182,9 @@ Boston, MA 02111-1307, USA. */ #undef HAVE_UALARM #undef HAVE_SYS_WAIT_H #undef HAVE_STRINGS_H +#undef HAVE_PWD_H +#undef HAVE_SYS_IOCTL_H +#undef HAVE_ULIMIT_H #undef HAVE_LIBDNET #undef HAVE_LIBPTHREADS @@ -453,7 +456,7 @@ Boston, MA 02111-1307, USA. */ #endif /* Avoid link-time collision with system mktime if we will use our own. */ -#if ! HAVE_MKTIME || BROKEN_MKTIME +#if ! HAVE_MKTIME || (defined (BROKEN_MKTIME) && BROKEN_MKTIME) #define mktime emacs_mktime #endif @@ -470,18 +473,6 @@ Boston, MA 02111-1307, USA. */ with care. */ #undef volatile -/* Some of the files of Emacs which are intended for use with other - programs assume that if you have a config.h file, you must declare - the type of getenv. - - This declaration shouldn't appear when alloca.s or Makefile.in - includes config.h. */ -#ifndef NOT_C_CODE -extern char *getenv (); -#endif - -#endif /* EMACS_CONFIG_H */ - /* These default definitions are good for almost all machines. The exceptions override them in m/MACHINE.h. */ @@ -518,9 +509,19 @@ extern char *getenv (); # define __P(args) args # else # define __P(args) () -# endif /* GCC. */ +# endif /* PROTOTYPES */ #endif /* __P */ +/* Some of the files of Emacs which are intended for use with other + programs assume that if you have a config.h file, you must declare + the type of getenv. + + This declaration shouldn't appear when alloca.s or Makefile.in + includes config.h. */ +#ifndef NOT_C_CODE +/* extern char *getenv __P ((const char *)); */ +#endif + /* Don't include "string.h" or in non-C code. */ #ifndef NOT_C_CODE @@ -555,3 +556,5 @@ extern char *getenv (); #else #define NO_RETURN /* nothing */ #endif + +#endif /* EMACS_CONFIG_H */ -- 2.39.2