aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpplib.c
diff options
context:
space:
mode:
authorNeil Booth <neilb@earthling.net>2000-08-18 17:35:58 +0000
committerNeil Booth <neil@gcc.gnu.org>2000-08-18 17:35:58 +0000
commit61d0346df824fbdb9f290a8e42c87025bfd03783 (patch)
treef25ad3759703df13e0d6b40b621ea7e6d2e1dd18 /gcc/cpplib.c
parent90d14f40a9c1d85bee827d94ce8f9bab8acb192c (diff)
downloadgcc-61d0346df824fbdb9f290a8e42c87025bfd03783.zip
gcc-61d0346df824fbdb9f290a8e42c87025bfd03783.tar.gz
gcc-61d0346df824fbdb9f290a8e42c87025bfd03783.tar.bz2
cpphash.h: Use HAVE_DESIGNATED_INITIALIZERS.
* cpphash.h: Use HAVE_DESIGNATED_INITIALIZERS. (_cpp_trigraph_map): Declaration moved from cpplex.c * cppinit.c: Define _cpp_trigraph_map. Use UCHAR_MAX + 1 instead of 256. Use consistent test for designated initializers. (cpp_init): Initialize trigraph_map. (initialize_standard_includes, parse_option): Use memcmp instead of strncmp. * cpplex.c (init_trigraph_map): Remove. (trigraph_ok, trigraph_replace, lex_line): Refer to _cpp_trigraph_map. * cpplib.c (str_match, WARNING, ERROR, ICE): Delete. (do_unassert): Remove unused "next" local. * system.h (HAVE_DESIGNATED_INITIALIZERS): New prototype. From-SVN: r35789
Diffstat (limited to 'gcc/cpplib.c')
-rw-r--r--gcc/cpplib.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index bc50452..5dd1697 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -61,10 +61,6 @@ static cpp_hashnode *
get_define_node PARAMS ((cpp_reader *));
static void unwind_if_stack PARAMS ((cpp_reader *, cpp_buffer *));
-/* Utility. */
-#define str_match(sym, len, str) \
-((len) == (sizeof (str) - 1) && !ustrncmp ((sym), U(str), sizeof (str) - 1))
-
/* This is the table of directive handlers. It is ordered by
frequency of occurrence; the numbers at the end are directive
counts from all the source code I have lying around (egcs and libc
@@ -1308,9 +1304,6 @@ _cpp_find_answer (node, candidate)
return result;
}
-#define WARNING(msgid) do { cpp_warning(pfile, msgid); goto error; } while (0)
-#define ERROR(msgid) do { cpp_error(pfile, msgid); goto error; } while (0)
-#define ICE(msgid) do { cpp_ice(pfile, msgid); goto error; } while (0)
static void
do_assert (pfile)
cpp_reader *pfile;
@@ -1346,7 +1339,7 @@ do_unassert (pfile)
cpp_reader *pfile;
{
cpp_hashnode *node;
- struct answer *answer, *temp, *next;
+ struct answer *answer, *temp;
node = _cpp_parse_assertion (pfile, &answer);
if (node)