diff options
| author | Jim Meyering <jim@meyering.net> | 2003-03-14 09:54:39 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-03-14 09:54:39 +0000 |
| commit | dfd085aa0dc0816d6112f3f304c497ad441a39a5 (patch) | |
| tree | 0e1f65a5320bcaebfe34aa46efefc48dd8d1d636 /lib | |
| parent | ee3bda46f846bade09ba1b63a6ac3b8dacdf3ed3 (diff) | |
| download | coreutils-dfd085aa0dc0816d6112f3f304c497ad441a39a5.tar.xz | |
Merge changes from Bison.
(__INT_TO_PTR) [__STDC__]: Cast result to
(void *) to avoid diagnostic with native c89 on SGI IRIX 6.5
when compiling Bison 1.875's `bitset bset = obstack_alloc
(bobstack, bytes);'. Problem reported by Nelson H. F. Beebe.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/obstack.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/obstack.h b/lib/obstack.h index c8c4ae942..c0fc9ac64 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -1,5 +1,5 @@ /* obstack.h - object stack macros - Copyright (C) 1988,89,90,91,92,93,94,96,97,98,99 Free Software Foundation, Inc. + Copyright (C) 1988,89,90,91,92,93,94,96,97,98,99,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. @@ -123,8 +123,12 @@ extern "C" { #endif #ifndef __INT_TO_PTR +#if defined __STDC__ && __STDC__ +# define __INT_TO_PTR(P) ((void *) ((P) + (char *) 0)) +#else # define __INT_TO_PTR(P) ((P) + (char *) 0) #endif +#endif /* We need the type of the resulting object. If __PTRDIFF_TYPE__ is defined, as with GNU C, use that; that way we don't pollute the |