From 88cec4d1358b874a96035e8b4a38a0b57c84c496 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 21 Feb 2002 03:54:34 +0000 Subject: [PATCH] ed Feb 20 22:35:42 2002 Owen Taylor 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 | 12 ++++++++++++ ChangeLog.pre-2-0 | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-12 | 12 ++++++++++++ ChangeLog.pre-2-2 | 12 ++++++++++++ ChangeLog.pre-2-4 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ configure.in | 2 +- glib/giounix.c | 2 +- tests/uri-test.c | 7 +++++++ 11 files changed, 105 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a78b0d1f..0365c9813 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Wed Feb 20 22:35:42 2002 Owen Taylor + + 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 * glib/gstring.[ch] (g_string_erase): Use gssize instead of diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8a78b0d1f..0365c9813 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,15 @@ +Wed Feb 20 22:35:42 2002 Owen Taylor + + 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 * glib/gstring.[ch] (g_string_erase): Use gssize instead of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8a78b0d1f..0365c9813 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Wed Feb 20 22:35:42 2002 Owen Taylor + + 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 * glib/gstring.[ch] (g_string_erase): Use gssize instead of diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 8a78b0d1f..0365c9813 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,15 @@ +Wed Feb 20 22:35:42 2002 Owen Taylor + + 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 * glib/gstring.[ch] (g_string_erase): Use gssize instead of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8a78b0d1f..0365c9813 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,15 @@ +Wed Feb 20 22:35:42 2002 Owen Taylor + + 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 * glib/gstring.[ch] (g_string_erase): Use gssize instead of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8a78b0d1f..0365c9813 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Wed Feb 20 22:35:42 2002 Owen Taylor + + 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 * glib/gstring.[ch] (g_string_erase): Use gssize instead of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8a78b0d1f..0365c9813 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Wed Feb 20 22:35:42 2002 Owen Taylor + + 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 * glib/gstring.[ch] (g_string_erase): Use gssize instead of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8a78b0d1f..0365c9813 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Wed Feb 20 22:35:42 2002 Owen Taylor + + 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 * glib/gstring.[ch] (g_string_erase): Use gssize instead of diff --git a/configure.in b/configure.in index 240b08790..573041fc2 100644 --- a/configure.in +++ b/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 diff --git a/glib/giounix.c b/glib/giounix.c index 826a2e5b4..84b2623eb 100644 --- a/glib/giounix.c +++ b/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; diff --git a/tests/uri-test.c b/tests/uri-test.c index f16d26552..000917656 100644 --- a/tests/uri-test.c +++ b/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 ();