X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fprogname.h;h=b4f3c2778ae8898c675eb05436733ea435be439e;hb=84d1749c4b5ad026522be96537320556ec6f7a57;hp=8b0eeda86f3b17150a958c06c3708df228df2207;hpb=ea1d8c004c8d70b20a1ee910f75abb5a68ace9e0;p=gnulib.git

diff --git a/lib/progname.h b/lib/progname.h
index 8b0eeda86..b4f3c2778 100644
--- a/lib/progname.h
+++ b/lib/progname.h
@@ -1,11 +1,11 @@
 /* Program name management.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+   Copyright (C) 2001-2004, 2006, 2009-2013 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2001.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,26 +13,27 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _PROGNAME_H
 #define _PROGNAME_H
 
-#include <stdbool.h>
-
-/* This file supports selectively prefixing or nor prefixing error messages
-   with the program name.
-
-   Programs using this file should do the following in main():
+/* Programs using this file should do the following in main():
      set_program_name (argv[0]);
-     error_print_progname = maybe_print_progname;
  */
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* String containing name the program is called with.  */
 extern const char *program_name;
 
-/* Set program_name, based on argv[0].  */
+/* Set program_name, based on argv[0].
+   argv0 must be a string allocated with indefinite extent, and must not be
+   modified after this call.  */
 extern void set_program_name (const char *argv0);
 
 #if ENABLE_RELOCATABLE
@@ -40,8 +41,9 @@ extern void set_program_name (const char *argv0);
 /* Set program_name, based on argv[0], and original installation prefix and
    directory, for relocatability.  */
 extern void set_program_name_and_installdir (const char *argv0,
-					     const char *orig_installprefix,
-					     const char *orig_installdir);
+                                             const char *orig_installprefix,
+                                             const char *orig_installdir);
+#undef set_program_name
 #define set_program_name(ARG0) \
   set_program_name_and_installdir (ARG0, INSTALLPREFIX, INSTALLDIR)
 
@@ -51,4 +53,10 @@ extern char *get_full_program_name (void);
 
 #endif
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _PROGNAME_H */