diff options
| author | Jim Meyering <jim@meyering.net> | 1994-11-04 16:50:04 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1994-11-04 16:50:04 +0000 |
| commit | fad3ef71a45303c04ee7cf096db58c93672d2bca (patch) | |
| tree | 9014913bdc59ec3b643bce5dd034ec7e6d78e557 /lib | |
| parent | c21a3a4ec6dcc7b65f7029974ce76884bbd6721b (diff) | |
| download | coreutils-fad3ef71a45303c04ee7cf096db58c93672d2bca.tar.xz | |
merge with 3.9u1
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/obstack.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/obstack.h b/lib/obstack.h index 01767195d..840a63baa 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -119,7 +119,7 @@ Summary: but in traditional C it is usually long. If we are in ANSI C and don't already have ptrdiff_t get it. */ -#if defined (__STDC__) && ! defined (offsetof) +#if defined (__STDC__) && __STDC__ && ! defined (offsetof) #if defined (__GNUC__) && defined (IN_GCC) /* On Next machine, the system's stddef.h screws up if included after we have defined just ptrdiff_t, so include all of stddef.h. @@ -132,7 +132,7 @@ Summary: #include <stddef.h> #endif -#ifdef __STDC__ +#if defined (__STDC__) && __STDC__ #define PTR_INT_TYPE ptrdiff_t #else #define PTR_INT_TYPE long @@ -167,7 +167,7 @@ struct obstack /* control current object in current chunk */ /* Declare the external functions we use; they are in obstack.c. */ -#ifdef __STDC__ +#if defined (__STDC__) && __STDC__ extern void _obstack_newchunk (struct obstack *, int); extern void _obstack_free (struct obstack *, void *); extern int _obstack_begin (struct obstack *, int, int, @@ -181,7 +181,7 @@ extern int _obstack_begin (); extern int _obstack_begin_1 (); #endif -#ifdef __STDC__ +#if defined (__STDC__) && __STDC__ /* Do the function-declarations after the structs but before defining the macros. */ @@ -269,7 +269,10 @@ int obstack_chunk_size (struct obstack *obstack); #define obstack_blank_fast(h,n) ((h)->next_free += (n)) #if defined (__GNUC__) && defined (__STDC__) -#if __GNUC__ < 2 +/* 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__. */ +#if __GNUC__ < 2 || !__GNUC_MINOR__ #define __extension__ #endif @@ -492,7 +495,7 @@ __extension__ \ (h)->object_base = (h)->next_free, \ __INT_TO_PTR ((h)->temp))) -#ifdef __STDC__ +#if defined (__STDC__) && __STDC__ #define obstack_free(h,obj) \ ( (h)->temp = (char *)(obj) - (char *) (h)->chunk, \ (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\ |