ed Feb 20 22:35:42 2002 Owen Taylor <otaylor@redhat.com>

Fixes from Miroslaw Dobrzanski-Neumann (#71963)

        * glib/giounix.c (g_io_channel_new_file): Fix trailing comma
        in enum.

        * configure.in: Check for unsetenv.

        * test/uri-test.c: Fall back to trying putenv(VARNAME) if
        unsetenv isn't present.

ChangeLog

@@ -1,3 +1,15 @@
+Wed Feb 20 22:35:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Fixes from Miroslaw Dobrzanski-Neumann (#71963)
+
+	* glib/giounix.c (g_io_channel_new_file): Fix trailing comma
+	in enum.
+
+	* configure.in: Check for unsetenv.
+
+	* test/uri-test.c: Fall back to trying putenv(VARNAME) if
+	unsetenv isn't present.
+
 2002-02-20  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	* glib/gstring.[ch] (g_string_erase): Use gssize instead of

ChangeLog.pre-2-0

@@ -1,3 +1,15 @@
+Wed Feb 20 22:35:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Fixes from Miroslaw Dobrzanski-Neumann (#71963)
+
+	* glib/giounix.c (g_io_channel_new_file): Fix trailing comma
+	in enum.
+
+	* configure.in: Check for unsetenv.
+
+	* test/uri-test.c: Fall back to trying putenv(VARNAME) if
+	unsetenv isn't present.
+
 2002-02-20  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	* glib/gstring.[ch] (g_string_erase): Use gssize instead of

ChangeLog.pre-2-10

@@ -1,3 +1,15 @@
+Wed Feb 20 22:35:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Fixes from Miroslaw Dobrzanski-Neumann (#71963)
+
+	* glib/giounix.c (g_io_channel_new_file): Fix trailing comma
+	in enum.
+
+	* configure.in: Check for unsetenv.
+
+	* test/uri-test.c: Fall back to trying putenv(VARNAME) if
+	unsetenv isn't present.
+
 2002-02-20  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	* glib/gstring.[ch] (g_string_erase): Use gssize instead of

ChangeLog.pre-2-12

@@ -1,3 +1,15 @@
+Wed Feb 20 22:35:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Fixes from Miroslaw Dobrzanski-Neumann (#71963)
+
+	* glib/giounix.c (g_io_channel_new_file): Fix trailing comma
+	in enum.
+
+	* configure.in: Check for unsetenv.
+
+	* test/uri-test.c: Fall back to trying putenv(VARNAME) if
+	unsetenv isn't present.
+
 2002-02-20  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	* glib/gstring.[ch] (g_string_erase): Use gssize instead of

ChangeLog.pre-2-2

@@ -1,3 +1,15 @@
+Wed Feb 20 22:35:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Fixes from Miroslaw Dobrzanski-Neumann (#71963)
+
+	* glib/giounix.c (g_io_channel_new_file): Fix trailing comma
+	in enum.
+
+	* configure.in: Check for unsetenv.
+
+	* test/uri-test.c: Fall back to trying putenv(VARNAME) if
+	unsetenv isn't present.
+
 2002-02-20  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	* glib/gstring.[ch] (g_string_erase): Use gssize instead of

ChangeLog.pre-2-4

@@ -1,3 +1,15 @@
+Wed Feb 20 22:35:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Fixes from Miroslaw Dobrzanski-Neumann (#71963)
+
+	* glib/giounix.c (g_io_channel_new_file): Fix trailing comma
+	in enum.
+
+	* configure.in: Check for unsetenv.
+
+	* test/uri-test.c: Fall back to trying putenv(VARNAME) if
+	unsetenv isn't present.
+
 2002-02-20  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	* glib/gstring.[ch] (g_string_erase): Use gssize instead of

ChangeLog.pre-2-6

@@ -1,3 +1,15 @@
+Wed Feb 20 22:35:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Fixes from Miroslaw Dobrzanski-Neumann (#71963)
+
+	* glib/giounix.c (g_io_channel_new_file): Fix trailing comma
+	in enum.
+
+	* configure.in: Check for unsetenv.
+
+	* test/uri-test.c: Fall back to trying putenv(VARNAME) if
+	unsetenv isn't present.
+
 2002-02-20  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	* glib/gstring.[ch] (g_string_erase): Use gssize instead of

ChangeLog.pre-2-8

@@ -1,3 +1,15 @@
+Wed Feb 20 22:35:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+	Fixes from Miroslaw Dobrzanski-Neumann (#71963)
+
+	* glib/giounix.c (g_io_channel_new_file): Fix trailing comma
+	in enum.
+
+	* configure.in: Check for unsetenv.
+
+	* test/uri-test.c: Fall back to trying putenv(VARNAME) if
+	unsetenv isn't present.
+
 2002-02-20  Daniel Elstner  <daniel.elstner@gmx.net>
 
 	* glib/gstring.[ch] (g_string_erase): Use gssize instead of

configure.in

@@ -576,7 +576,7 @@ GLIB_SIZEOF([$size_includes], ptrdiff_t, ptrdiff_t)
 GLIB_SIZEOF([$size_includes], intmax_t, intmax_t)
 
 # Check for some functions
-AC_CHECK_FUNCS(lstat strerror strsignal memmove mkstemp vsnprintf stpcpy strcasecmp strncasecmp poll getcwd nanosleep vasprintf)
+AC_CHECK_FUNCS(lstat strerror strsignal memmove mkstemp vsnprintf stpcpy strcasecmp strncasecmp poll getcwd nanosleep vasprintf unsetenv)
 
 AC_FUNC_VSNPRINTF_C99
 

glib/giounix.c

@@ -439,7 +439,7 @@ g_io_channel_new_file (const gchar *filename,
     MODE_R = 1 << 0,
     MODE_W = 1 << 1,
     MODE_A = 1 << 2,
-    MODE_PLUS = 1 << 3,
+    MODE_PLUS = 1 << 3
   } mode_num;
   struct stat buffer;
 

tests/uri-test.c

@@ -316,7 +316,14 @@ main (int   argc,
       char *argv[])
 {
 #ifdef G_OS_UNIX
+#  ifdef HAVE_UNSETENV  
   unsetenv ("G_BROKEN_FILENAMES");
+#  else
+  /* putenv with no = isn't standard, but works to unset the variable
+   * on some systems
+   */
+  putenv ("G_BROKEN_FILENAMES");
+#  endif  
 #endif
 
   run_to_uri_tests ();