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
This commit is contained in:
Kaveh R. Ghazi 1998-11-08 14:45:39 +00:00 committed by Kaveh Ghazi
parent 5c0aa6d0a0
commit de5809b91d
4 changed files with 22 additions and 10 deletions

View File

@ -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> Sat Nov 7 16:04:03 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* demangle.h: Don't include gansidecl.h. * demangle.h: Don't include gansidecl.h.

View File

@ -103,10 +103,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define PTRCONST void *CONST #define PTRCONST void *CONST
#define LONG_DOUBLE long double #define LONG_DOUBLE long double
#ifndef IN_GCC
#define AND , #define AND ,
#define NOARGS void #define NOARGS void
#define VOLATILE volatile #define VOLATILE volatile
#define SIGNED signed #define SIGNED signed
#endif /* ! IN_GCC */
#define PARAMS(paramlist) paramlist #define PARAMS(paramlist) paramlist
#define ANSI_PROTOTYPES 1 #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) #define VA_START(va_list,var) va_start(va_list,var)
/* These are obsolete. Do not use. */ /* These are obsolete. Do not use. */
#ifndef IN_GCC
#define CONST const #define CONST const
#define DOTS , ... #define DOTS , ...
#define PROTO(type, name, arglist) type name arglist #define PROTO(type, name, arglist) type name arglist
#define EXFUN(name, proto) name proto #define EXFUN(name, proto) name proto
#define DEFUN(name, arglist, args) name(args) #define DEFUN(name, arglist, args) name(args)
#define DEFUN_VOID(name) name(void) #define DEFUN_VOID(name) name(void)
#endif /* ! IN_GCC */
#else /* Not ANSI C. */ #else /* Not ANSI C. */
@ -128,13 +132,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#define PTRCONST PTR #define PTRCONST PTR
#define LONG_DOUBLE double #define LONG_DOUBLE double
#ifndef IN_GCC
#define AND ; #define AND ;
#define NOARGS #define NOARGS
#define VOLATILE
#define SIGNED
#endif /* !IN_GCC */
#ifndef const /* some systems define it in header files for non-ansi mode */ #ifndef const /* some systems define it in header files for non-ansi mode */
#define const #define const
#endif #endif
#define VOLATILE
#define SIGNED
#define PARAMS(paramlist) () #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) #define VA_START(va_list,var) va_start(va_list)
/* These are obsolete. Do not use. */ /* These are obsolete. Do not use. */
#ifndef IN_GCC
#define CONST #define CONST
#define DOTS #define DOTS
#define PROTO(type, name, arglist) type name () #define PROTO(type, name, arglist) type name ()
#define EXFUN(name, proto) name() #define EXFUN(name, proto) name()
#define DEFUN(name, arglist, args) name arglist args; #define DEFUN(name, arglist, args) name arglist args;
#define DEFUN_VOID(name) name() #define DEFUN_VOID(name) name()
#endif /* ! IN_GCC */
#endif /* ANSI C. */ #endif /* ANSI C. */

View File

@ -20,11 +20,9 @@
#if !defined (DEMANGLE_H) #if !defined (DEMANGLE_H)
#define DEMANGLE_H #define DEMANGLE_H
#ifdef IN_GCC #ifndef IN_GCC
#define PARAMS(ARGS) PROTO(ARGS)
#else /* ! IN_GCC */
#include <ansidecl.h> #include <ansidecl.h>
#endif /* IN_GCC */ #endif /* ! IN_GCC */
/* Options passed to cplus_demangle (in 2nd parameter). */ /* Options passed to cplus_demangle (in 2nd parameter). */

View File

@ -33,11 +33,9 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifdef IN_GCC #ifndef IN_GCC
#define PARAMS(ARGS) PROTO(ARGS)
#else /* ! IN_GCC */
#include <ansidecl.h> #include <ansidecl.h>
#endif /* IN_GCC */ #endif /* ! IN_GCC */
/* Use typedefs for the key and data types to facilitate changing /* Use typedefs for the key and data types to facilitate changing
these types, if necessary. These types should be sufficiently wide these types, if necessary. These types should be sufficiently wide