Make these files usable by tests/lang-c++.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 09e53cbfed4be2fada0d7927395f11ae51736b28..c263c4173a6bfdfc12454d7cb0d482ff4574ee43 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-09  Bruno Haible  <bruno@clisp.org>
+
+       * setenv.h: Make it possible to include this file from C++.
+       * xsetenv.h: Likewise.
+
 2002-01-05  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (libgettextlib_la_LDFLAGS): Add -lc. Needed on AIX.

diff --git a/lib/setenv.h b/lib/setenv.h
index 26eec10676c63fb99a1cfdc608bc5c06b8907847..594787785657c1bda187369618d59e4dd246c801 100644 (file)
--- a/lib/setenv.h
+++ b/lib/setenv.h
@@ -1,5 +1,5 @@
 /* Setting environment variables.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
 
    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
@@ -30,6 +30,10 @@
 
 #else
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.  */
 extern int setenv PARAMS ((const char *name, const char *value, int replace));
@@ -37,4 +41,8 @@ extern int setenv PARAMS ((const char *name, const char *value, int replace));
 /* Remove the variable NAME from the environment.  */
 extern int unsetenv PARAMS ((const char *name));
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/lib/xsetenv.h b/lib/xsetenv.h
index 20f4b69cb120f73c6b462bf6b27bc0b0a0b514e7..67803f09333fbb1368b223fd1f8aadd7a996bd52 100644 (file)
--- a/lib/xsetenv.h
+++ b/lib/xsetenv.h
@@ -1,5 +1,5 @@
 /* Setting environment variables, with out-of-memory checking.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002 Free Software Foundation, Inc.
 
    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
@@ -18,7 +18,15 @@
 /* Get unsetenv().  It can be used without error checking.  */
 #include "setenv.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Set NAME to VALUE in the environment.
    If REPLACE is nonzero, overwrite an existing value.
    With error checking.  */
 extern void xsetenv PARAMS ((const char *name, const char *value, int replace));
+
+#ifdef __cplusplus
+}
+#endif