Update.

3 files changed, 7 insertions, 28 deletions

diff --git a/gl/alloca_.h b/gl/alloca_.h
index 8a91698c54..799037ce09 100644
--- a/gl/alloca_.h
+++ b/gl/alloca_.h
@@ -18,12 +18,10 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.  */
 
-/* When this file is included, it may be preceded only by preprocessor
-   declarations.  Thanks to AIX.  Therefore we include it right after
-   "config.h", not later.  */
-
-#ifndef _ALLOCA_H
-# define _ALLOCA_H
+/* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
+   means there is a real alloca function.  */
+#ifndef _GNULIB_ALLOCA_H
+# define _GNULIB_ALLOCA_H
 
 /* alloca (N) returns a pointer to N bytes of memory
    allocated on the stack, which will last until the function returns.
@@ -39,7 +37,7 @@
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #elif defined _AIX
-# define alloca __alloca 
+# define alloca __alloca
 #elif defined _MSC_VER
 # include <malloc.h>
 # define alloca _alloca
@@ -51,4 +49,4 @@ extern "C"
 void *alloca (size_t);
 #endif
 
-#endif /* _ALLOCA_H */
+#endif /* _GNULIB_ALLOCA_H */
diff --git a/gl/progname.c b/gl/progname.c
index 84989fd0cc..8453706c93 100644
--- a/gl/progname.c
+++ b/gl/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -51,16 +51,3 @@ set_program_name (const char *argv0)
     argv0 = base + 3;
   program_name = argv0;
 }
-
-/* Return short program name of the current executable, based on the
-   earlier call to set_program_name.  Return NULL if unknown.  The
-   short program name is computed by removing all directory names and
-   path separators. */
-const char *
-get_short_program_name (void)
-{
-  const char *slash = NULL;
-  if (program_name)
-    slash = strrchr (program_name, '/');
-  return slash != NULL ? slash + 1 : program_name;
-}
diff --git a/gl/progname.h b/gl/progname.h
index 6b990654f7..5292cd1bfd 100644
--- a/gl/progname.h
+++ b/gl/progname.h
@@ -35,12 +35,6 @@ extern const char *program_name;
 /* Set program_name, based on argv[0].  */
 extern void set_program_name (const char *argv0);
 
-/* Return short program name of the current executable, based on the
-   earlier call to set_program_name.  Return NULL if unknown.  The
-   short program name is computed by removing all directory names and
-   path separators. */
-extern const char *get_short_program_name (void);
-
 #if ENABLE_RELOCATABLE
 
 /* Set program_name, based on argv[0], and original installation prefix and