diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 1998-11-08 14:45:39 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 1998-11-08 14:45:39 +0000 |
| commit | de5809b91dea597346f171d3e28522037af76a00 (patch) | |
| tree | 883d022bf5a15b06d65f6e870610ec1c985bf5b1 /include | |
| parent | 5c0aa6d0a0ea257515d0afb35517c30dfaaea210 (diff) | |
| download | gcc-de5809b91dea597346f171d3e28522037af76a00.zip gcc-de5809b91dea597346f171d3e28522037af76a00.tar.gz gcc-de5809b91dea597346f171d3e28522037af76a00.tar.bz2 | |
ansidecl.h: Wrap problematic macros with !IN_GCC.
* ansidecl.h: Wrap problematic macros with !IN_GCC.
* demangle.h: Never define PARAMS().
* splay-tree.h: Likewise.
From-SVN: r23574
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 7 | ||||
| -rw-r--r-- | include/ansidecl.h | 13 | ||||
| -rw-r--r-- | include/demangle.h | 6 | ||||
| -rw-r--r-- | include/splay-tree.h | 6 |
4 files changed, 22 insertions, 10 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 18f8803..453f1ea 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +Sun Nov 8 17:42:25 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * ansidecl.h: Wrap problematic macros with !IN_GCC. + + * demangle.h: Never define PARAMS(). + * splay-tree.h: Likewise. + Sat Nov 7 16:04:03 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * demangle.h: Don't include gansidecl.h. diff --git a/include/ansidecl.h b/include/ansidecl.h index abe87a9..cdb9fb7 100644 --- a/include/ansidecl.h +++ b/include/ansidecl.h @@ -103,10 +103,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PTRCONST void *CONST #define LONG_DOUBLE long double +#ifndef IN_GCC #define AND , #define NOARGS void #define VOLATILE volatile #define SIGNED signed +#endif /* ! IN_GCC */ #define PARAMS(paramlist) paramlist #define ANSI_PROTOTYPES 1 @@ -115,12 +117,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define VA_START(va_list,var) va_start(va_list,var) /* These are obsolete. Do not use. */ +#ifndef IN_GCC #define CONST const #define DOTS , ... #define PROTO(type, name, arglist) type name arglist #define EXFUN(name, proto) name proto #define DEFUN(name, arglist, args) name(args) #define DEFUN_VOID(name) name(void) +#endif /* ! IN_GCC */ #else /* Not ANSI C. */ @@ -128,13 +132,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PTRCONST PTR #define LONG_DOUBLE double +#ifndef IN_GCC #define AND ; #define NOARGS +#define VOLATILE +#define SIGNED +#endif /* !IN_GCC */ + #ifndef const /* some systems define it in header files for non-ansi mode */ #define const #endif -#define VOLATILE -#define SIGNED #define PARAMS(paramlist) () @@ -142,12 +149,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define VA_START(va_list,var) va_start(va_list) /* These are obsolete. Do not use. */ +#ifndef IN_GCC #define CONST #define DOTS #define PROTO(type, name, arglist) type name () #define EXFUN(name, proto) name() #define DEFUN(name, arglist, args) name arglist args; #define DEFUN_VOID(name) name() +#endif /* ! IN_GCC */ #endif /* ANSI C. */ diff --git a/include/demangle.h b/include/demangle.h index 428a3c5..5bca39c 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -20,11 +20,9 @@ #if !defined (DEMANGLE_H) #define DEMANGLE_H -#ifdef IN_GCC -#define PARAMS(ARGS) PROTO(ARGS) -#else /* ! IN_GCC */ +#ifndef IN_GCC #include <ansidecl.h> -#endif /* IN_GCC */ +#endif /* ! IN_GCC */ /* Options passed to cplus_demangle (in 2nd parameter). */ diff --git a/include/splay-tree.h b/include/splay-tree.h index 9389dda..414d828 100644 --- a/include/splay-tree.h +++ b/include/splay-tree.h @@ -33,11 +33,9 @@ extern "C" { #endif /* __cplusplus */ -#ifdef IN_GCC -#define PARAMS(ARGS) PROTO(ARGS) -#else /* ! IN_GCC */ +#ifndef IN_GCC #include <ansidecl.h> -#endif /* IN_GCC */ +#endif /* ! IN_GCC */ /* Use typedefs for the key and data types to facilitate changing these types, if necessary. These types should be sufficiently wide |