obstack: remove __STDC__ conditionals

* lib/obstack.h: Remove __STDC__ conditionals, as suggested by Joseph
S. Myers in <http://cygwin.com/ml/libc-alpha/2012-01/msg00104.html>.
This leaves lib/localcharset.c, m4/iconv.m4, and a confusing comment in
m4/include_next.m4 as the only gnulib-maintained places that still
refer to __STDC__.

diff --git a/ChangeLog b/ChangeLog
index a0ce8a1..cd2ba5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       obstack: remove __STDC__ conditionals
+       * lib/obstack.h: Remove __STDC__ conditionals, as suggested by Joseph
+       S. Myers in <http://cygwin.com/ml/libc-alpha/2012-01/msg00104.html>.
+       This leaves lib/localcharset.c, m4/iconv.m4, and a confusing comment in
+       m4/include_next.m4 as the only gnulib-maintained places that still
+       refer to __STDC__.
+
 2012-01-24  Bruno Haible  <bruno@clisp.org>
 
        havelib: Modern quoting.

diff --git a/lib/obstack.h b/lib/obstack.h
index 0a1e473..b7d2404 100644 (file)
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -253,7 +253,7 @@ extern int obstack_exit_failure;
 
 #define obstack_memory_used(h) _obstack_memory_used (h)
 \f
-#if defined __GNUC__ && defined __STDC__ && __STDC__
+#if defined __GNUC__
 /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
    does not implement __extension__.  But that compiler doesn't define
    __GNUC_MINOR__.  */
@@ -405,7 +405,7 @@ __extension__                                                           \
      __o->next_free = __o->object_base = (char *)__obj;                 \
    else (__obstack_free) (__o, __obj); })
 \f
-#else /* not __GNUC__ or not __STDC__ */
+#else /* not __GNUC__ */
 
 # define obstack_object_size(h) \
  (unsigned) ((h)->next_free - (h)->object_base)
@@ -503,7 +503,7 @@ __extension__                                                           \
             = (h)->temp.tempint + (char *) (h)->chunk)                  \
    : (((__obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
 
-#endif /* not __GNUC__ or not __STDC__ */
+#endif /* not __GNUC__ */
 
 #ifdef __cplusplus
 }       /* C++ */