Fix syntax error in the !HAVE_SETENV case.

2003-08-08  Tor Lillqvist  <tml@iki.fi>

	* glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV
	case.

diff --git a/ChangeLog b/ChangeLog
index 3fe837a..f689c18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV
+       case.
+

 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS
 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3fe837a..f689c18 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-08-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV
+       case.
+

 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS
 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3fe837a..f689c18 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2003-08-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV
+       case.
+

 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS
 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3fe837a..f689c18 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-08-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV
+       case.
+

 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS
 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3fe837a..f689c18 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-08-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV
+       case.
+

 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS
 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3fe837a..f689c18 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-08-08  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/gutils.c (g_setenv): Fix syntax error in the !HAVE_SETENV
+       case.
+

 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS
 2003-08-08  Matthias Clasen  <maclas@gmx.de>
 
        * tests/env-test.c (main): Remove a test for getenv() behaviour which isn't specified by SUS

diff --git a/glib/gutils.c b/glib/gutils.c
index 18ef828..c98f362 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -716,12 +716,15 @@ g_setenv (const gchar *variable,
          gboolean     overwrite)
 {
   gint result;
          gboolean     overwrite)
 {
   gint result;

+#ifndef HAVE_SETENV
+  gchar *string;
+#endif
+

   g_return_val_if_fail (strchr (variable, '=') == NULL, FALSE);
   g_return_val_if_fail (strchr (variable, '=') == NULL, FALSE);

+

 #ifdef HAVE_SETENV
   result = setenv (variable, value, overwrite);
 #else
 #ifdef HAVE_SETENV
   result = setenv (variable, value, overwrite);
 #else

-  gchar *string;
-  

   if (!overwrite && g_getenv (variable) != NULL)
     return TRUE;
   
   if (!overwrite && g_getenv (variable) != NULL)
     return TRUE;