This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH INSTALLED]: Poison PARAMS in system.h
- From: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 7 Apr 2005 21:08:38 -0400 (EDT)
- Subject: [PATCH INSTALLED]: Poison PARAMS in system.h
Now that libiberty has had the include directory converted to ISO C,
GCC doesn't get any PARAMS macros pulled in. So we can poison it. In
the process, I had to zap a few straggling PARAMS in the java dir.
(The last K&R compatibility macro from ansidecl.h left unpoisoned in
GCC is PTR. But that one isn't safe to poison yet for various
reasons.)
Bootstrapped on x86_64-unknown-linux-gnu and installed as obvious on
mainline.
--Kaveh
2005-04-07 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* system.h: Poison PARAMS.
java:
* java-tree.h: Don't use PARAMS().
diff -rup orig/egcc-CVS20050405/gcc/system.h egcc-CVS20050405/gcc/system.h
--- orig/egcc-CVS20050405/gcc/system.h 2005-04-05 23:19:29.000000000 -0400
+++ egcc-CVS20050405/gcc/system.h 2005-04-06 12:27:55.319676768 -0400
@@ -675,13 +675,14 @@ extern void fancy_abort (const char *, i
#undef ANSI_PROTOTYPES
#undef PTR_CONST
#undef LONG_DOUBLE
+#undef PARAMS
#undef VPARAMS
#undef VA_OPEN
#undef VA_FIXEDARG
#undef VA_CLOSE
#undef VA_START
- #pragma GCC poison ANSI_PROTOTYPES PTR_CONST LONG_DOUBLE VPARAMS VA_OPEN \
- VA_FIXEDARG VA_CLOSE VA_START
+ #pragma GCC poison ANSI_PROTOTYPES PTR_CONST LONG_DOUBLE PARAMS VPARAMS \
+ VA_OPEN VA_FIXEDARG VA_CLOSE VA_START
#endif /* IN_GCC */
/* Note: not all uses of the `index' token (e.g. variable names and
diff -rup orig/egcc-CVS20050405/gcc/java/java-tree.h egcc-CVS20050405/gcc/java/java-tree.h
--- orig/egcc-CVS20050405/gcc/java/java-tree.h 2005-03-06 21:20:20.000000000 -0500
+++ egcc-CVS20050405/gcc/java/java-tree.h 2005-04-07 15:22:44.889223320 -0400
@@ -1883,8 +1883,8 @@ enum
#define EXPR_WFL_LINECOL(NODE) ((NODE)->exp.locus)
#define EXPR_WFL_FILENAME(NODE) EXPR_FILENAME (NODE)
#define EXPR_WFL_LINENO(NODE) EXPR_LINENO (NODE)
-extern tree build_expr_wfl PARAMS ((tree, source_location));
-extern tree expr_add_location PARAMS ((tree, source_location, bool));
+extern tree build_expr_wfl (tree, source_location);
+extern tree expr_add_location (tree, source_location, bool);
#define build_unknown_wfl(NODE) build_expr_wfl(NODE, UNKNOWN_LOCATION)
#else
#define EXPR_WFL_LINECOL(NODE) (EXPR_CHECK (NODE)->exp.complexity)
@@ -1899,12 +1899,12 @@ extern tree expr_add_location
#define EXPR_WFL_SET_LINECOL(NODE, LINE, COL) \
(EXPR_WFL_LINECOL(NODE) = ((LINE) << 12) | ((COL) & 0xfff))
-extern tree build_expr_wfl PARAMS ((tree, const char *, int, int));
+extern tree build_expr_wfl (tree, const char *, int, int);
#define build_unknown_wfl(NODE) build_expr_wfl(NODE, NULL, 0, 0)
#endif
-extern void java_genericize PARAMS ((tree));
-extern int java_gimplify_expr PARAMS ((tree *, tree *, tree *));
+extern void java_genericize (tree);
+extern int java_gimplify_expr (tree *, tree *, tree *);
extern tree extract_field_decl (tree);