* src/system.h: Don't use #ifdef/#ifndef on HAVE_ values, only

#if.

diff --git a/ChangeLog b/ChangeLog
index e2d714b0f99b2965876bdc8fa8c8b299f3e677b6..e535ddb38eb18ac2ddc1e075b61d6155114ef278 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-30  Akim Demaille  <akim@epita.fr>
+
+       * src/system.h: Don't use #ifdef/#ifndef on HAVE_ values, only
+       #if.
+

 2002-10-24  Paul Eggert  <eggert@twinsun.com>
 
        Version 1.75a.
 2002-10-24  Paul Eggert  <eggert@twinsun.com>
 
        Version 1.75a.

diff --git a/src/system.h b/src/system.h
index 3dcd007b038bab8331bd7fc8370b361ee7276e22..9bd72650ed2f4ed01dfeeb550262494f2ed2510a 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -18,7 +18,7 @@
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 

-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H

 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 


@@ -103,27 +103,27 @@ extern int time_report;
 | Missing prototypes.  |
 `---------------------*/
 
 | Missing prototypes.  |
 `---------------------*/
 

-#if !HAVE_DECL_STPCPY
+#if defined HAVE_DECL_STPCPY && !HAVE_DECL_STPCPY

 char *stpcpy (char *dest, const char *src);
 #endif
 
 char *stpcpy (char *dest, const char *src);
 #endif
 

-#if !HAVE_DECL_STRCHR
+#if defined HAVE_DECL_STRCHR && !HAVE_DECL_STRCHR

 char *strchr (const char *s, int c);
 #endif
 
 char *strchr (const char *s, int c);
 #endif
 

-#if !HAVE_DECL_STRSPN
+#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN

 size_t strspn (const char *s, const char *accept);
 #endif
 
 size_t strspn (const char *s, const char *accept);
 #endif
 

-#if !HAVE_DECL_STRNLEN
+#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN

 size_t strnlen (const char *s, size_t maxlen);
 #endif
 
 size_t strnlen (const char *s, size_t maxlen);
 #endif
 

-#if !HAVE_DECL_MEMCHR
+#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR

 void *memchr (const void *s, int c, size_t n);
 #endif
 
 void *memchr (const void *s, int c, size_t n);
 #endif
 

-#if !HAVE_DECL_MEMRCHR
+#if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR

 void *memrchr (const void *s, int c, size_t n);
 #endif
 
 void *memrchr (const void *s, int c, size_t n);
 #endif
 


@@ -160,10 +160,10 @@ void *memrchr (const void *s, int c, size_t n);
 | NLS.  |
 `------*/
 
 | NLS.  |
 `------*/
 

-#ifdef HAVE_LOCALE_H
+#if HAVE_LOCALE_H

 # include <locale.h>
 #endif
 # include <locale.h>
 #endif

-#ifndef HAVE_SETLOCALE
+#if !HAVE_SETLOCALE

 # define setlocale(Category, Locale)
 #endif
 
 # define setlocale(Category, Locale)
 #endif