X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fprogname.h;h=82615c6bc05bffd10d9631f9c47b0e24ccd96b47;hb=a5c02266250d51d94c137f4fca8bec8e7654ff8c;hp=89f0127c78b5751fec3d1c9f413d7cc5b30b5ed4;hpb=c04bc106f2977f098ccc8a29da37af55c2d098ad;p=gnulib.git

diff --git a/lib/progname.h b/lib/progname.h
index 89f0127c7..82615c6bc 100644
--- a/lib/progname.h
+++ b/lib/progname.h
@@ -1,11 +1,11 @@
 /* Program name management.
-   Copyright (C) 2001-2003 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006 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
+   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,18 +13,21 @@
    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>
-
 /* Programs using this file should do the following in main():
      set_program_name (argv[0]);
  */
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* String containing name the program is called with.  */
 extern const char *program_name;
 
@@ -38,6 +41,7 @@ extern void set_program_name (const char *argv0);
 extern void set_program_name_and_installdir (const char *argv0,
 					     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)
 
@@ -47,4 +51,10 @@ extern char *get_full_program_name (void);
 
 #endif
 
+
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif /* _PROGNAME_H */