about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-10-11 02:32:32 +0000
committerUlrich Drepper <drepper@redhat.com>2007-10-11 02:32:32 +0000
commit069293a7e7b6b22401e0b13345fa555c7d5a878c (patch)
treeae9295723b8b7bcc1893c3821969859c7b50ff0b
parentd17af6b501e3b9dd3b4d77c0b9b2f663f519f5cf (diff)
downloadglibc-069293a7e7b6b22401e0b13345fa555c7d5a878c.tar.gz
glibc-069293a7e7b6b22401e0b13345fa555c7d5a878c.tar.xz
glibc-069293a7e7b6b22401e0b13345fa555c7d5a878c.zip
Remove tok_elif, add tok_elifdef and tok_elifndef.
-rw-r--r--locale/programs/locfile-kw.gperf5
-rw-r--r--locale/programs/locfile-token.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf
index 936256ab34..f0612e4882 100644
--- a/locale/programs/locfile-kw.gperf
+++ b/locale/programs/locfile-kw.gperf
@@ -1,5 +1,5 @@
 %{
-/* Copyright (C) 1996,1997,1998,1999,2000,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000,2005,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -76,7 +76,8 @@ define,                 tok_define,                 0
 undef,                  tok_undef,                  0
 ifdef,                  tok_ifdef,                  0
 else,                   tok_else,                   0
-elif,                   tok_elif,                   0
+elifdef,                tok_elifdef,                0
+elifndef,               tok_elifndef,               0
 endif,                  tok_endif,                  0
 LC_MONETARY,            tok_lc_monetary,            0
 int_curr_symbol,        tok_int_curr_symbol,        0
diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h
index d6db1a778c..aba0c0ef6b 100644
--- a/locale/programs/locfile-token.h
+++ b/locale/programs/locfile-token.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000,2005,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -115,7 +115,8 @@ enum token_t
   tok_ifdef,
   tok_ifndef,
   tok_else,
-  tok_elif,
+  tok_elifdef,
+  tok_elifndef,
   tok_endif,
   tok_lc_monetary,
   tok_int_curr_symbol,