From 9b4080611ac14c5579ca7491c512f07a0a9b8347 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 10 Apr 2004 01:55:57 +0000 Subject: [PATCH] glib/giowin32.c glib/gmain.c glib/gstrfuncs.c Decorating variable 2004-04-10 Tor Lillqvist * glib/giowin32.c * glib/gmain.c * glib/gstrfuncs.c * glib/gthread.c: Decorating variable definitions with __declspec(dllexport) causes problems on Cygwin build, and isn't really needed for a native Win32 build with mingw or MSVC, so remove. (#138402, Roger Leigh) * glib/libcharset/localcharset.c: Use Win32-specific code also on Cygwin. * tests/uri-test.c: Don't assume that local filenames are in UTF-8 on Cygwin, either. (#138412, Roger Leigh) --- ChangeLog | 15 +++++++++++++++ ChangeLog.pre-2-10 | 15 +++++++++++++++ ChangeLog.pre-2-12 | 15 +++++++++++++++ ChangeLog.pre-2-4 | 15 +++++++++++++++ ChangeLog.pre-2-6 | 15 +++++++++++++++ ChangeLog.pre-2-8 | 15 +++++++++++++++ glib/giowin32.c | 3 --- glib/gmain.c | 9 ++------- glib/gstrfuncs.c | 3 --- glib/gthread.c | 3 --- glib/libcharset/localcharset.c | 7 +++++++ tests/uri-test.c | 2 +- 12 files changed, 100 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7a4101..2857ac2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2004-04-10 Tor Lillqvist + + * glib/giowin32.c + * glib/gmain.c + * glib/gstrfuncs.c + * glib/gthread.c: Decorating variable definitions with + __declspec(dllexport) causes problems on Cygwin build, and isn't + really needed for a native Win32 build with mingw or MSVC, so + remove. (#138402, Roger Leigh) + + * glib/libcharset/localcharset.c: Use Win32-specific code also on + Cygwin. + * tests/uri-test.c: Don't assume that local filenames are in UTF-8 + on Cygwin, either. (#138412, Roger Leigh) + 2004-04-08 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c7a4101..2857ac2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,18 @@ +2004-04-10 Tor Lillqvist + + * glib/giowin32.c + * glib/gmain.c + * glib/gstrfuncs.c + * glib/gthread.c: Decorating variable definitions with + __declspec(dllexport) causes problems on Cygwin build, and isn't + really needed for a native Win32 build with mingw or MSVC, so + remove. (#138402, Roger Leigh) + + * glib/libcharset/localcharset.c: Use Win32-specific code also on + Cygwin. + * tests/uri-test.c: Don't assume that local filenames are in UTF-8 + on Cygwin, either. (#138412, Roger Leigh) + 2004-04-08 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c7a4101..2857ac2 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,18 @@ +2004-04-10 Tor Lillqvist + + * glib/giowin32.c + * glib/gmain.c + * glib/gstrfuncs.c + * glib/gthread.c: Decorating variable definitions with + __declspec(dllexport) causes problems on Cygwin build, and isn't + really needed for a native Win32 build with mingw or MSVC, so + remove. (#138402, Roger Leigh) + + * glib/libcharset/localcharset.c: Use Win32-specific code also on + Cygwin. + * tests/uri-test.c: Don't assume that local filenames are in UTF-8 + on Cygwin, either. (#138412, Roger Leigh) + 2004-04-08 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c7a4101..2857ac2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,18 @@ +2004-04-10 Tor Lillqvist + + * glib/giowin32.c + * glib/gmain.c + * glib/gstrfuncs.c + * glib/gthread.c: Decorating variable definitions with + __declspec(dllexport) causes problems on Cygwin build, and isn't + really needed for a native Win32 build with mingw or MSVC, so + remove. (#138402, Roger Leigh) + + * glib/libcharset/localcharset.c: Use Win32-specific code also on + Cygwin. + * tests/uri-test.c: Don't assume that local filenames are in UTF-8 + on Cygwin, either. (#138412, Roger Leigh) + 2004-04-08 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c7a4101..2857ac2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,18 @@ +2004-04-10 Tor Lillqvist + + * glib/giowin32.c + * glib/gmain.c + * glib/gstrfuncs.c + * glib/gthread.c: Decorating variable definitions with + __declspec(dllexport) causes problems on Cygwin build, and isn't + really needed for a native Win32 build with mingw or MSVC, so + remove. (#138402, Roger Leigh) + + * glib/libcharset/localcharset.c: Use Win32-specific code also on + Cygwin. + * tests/uri-test.c: Don't assume that local filenames are in UTF-8 + on Cygwin, either. (#138412, Roger Leigh) + 2004-04-08 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c7a4101..2857ac2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,18 @@ +2004-04-10 Tor Lillqvist + + * glib/giowin32.c + * glib/gmain.c + * glib/gstrfuncs.c + * glib/gthread.c: Decorating variable definitions with + __declspec(dllexport) causes problems on Cygwin build, and isn't + really needed for a native Win32 build with mingw or MSVC, so + remove. (#138402, Roger Leigh) + + * glib/libcharset/localcharset.c: Use Win32-specific code also on + Cygwin. + * tests/uri-test.c: Don't assume that local filenames are in UTF-8 + on Cygwin, either. (#138412, Roger Leigh) + 2004-04-08 Guntupalli Karunakar * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS. diff --git a/glib/giowin32.c b/glib/giowin32.c index 152c2c0..290cc93 100644 --- a/glib/giowin32.c +++ b/glib/giowin32.c @@ -734,9 +734,6 @@ g_io_win32_finalize (GSource *source) UNLOCK (channel->mutex); } -#if defined(G_PLATFORM_WIN32) && defined(__GNUC__) -__declspec(dllexport) -#endif GSourceFuncs g_io_watch_funcs = { g_io_win32_prepare, g_io_win32_check, diff --git a/glib/gmain.c b/glib/gmain.c index 00b0214..36c9e17 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -271,9 +271,6 @@ static gint child_watch_wake_up_pipe[2] = {0, 0}; G_LOCK_DEFINE_STATIC (main_context_list); static GSList *main_context_list = NULL; -#if defined(G_PLATFORM_WIN32) && defined(__GNUC__) -__declspec(dllexport) -#endif GSourceFuncs g_timeout_funcs = { g_timeout_prepare, @@ -290,9 +287,6 @@ GSourceFuncs g_child_watch_funcs = NULL }; -#if defined(G_PLATFORM_WIN32) && defined(__GNUC__) -__declspec(dllexport) -#endif GSourceFuncs g_idle_funcs = { g_idle_prepare, @@ -3666,7 +3660,8 @@ g_child_watch_source_init (void) /** * g_child_watch_source_new: - * @pid: process id of a child process to watch + * @pid: process id of a child process to watch. On Windows, a HANDLE + * for the process to watch (which actually doesn't have to be a child). * * Creates a new child_watch source. * diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index e28f93b..ae5d64a 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -75,9 +75,6 @@ static const guint16 ascii_table_data[256] = { /* the upper 128 are all zeroes */ }; -#if defined(G_PLATFORM_WIN32) && defined(__GNUC__) -__declspec(dllexport) -#endif const guint16 * const g_ascii_table = ascii_table_data; gchar* diff --git a/glib/gthread.c b/glib/gthread.c index c222beb..5d50744 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -95,9 +95,6 @@ static GSystemThread zero_thread; /* This is initialized to all zero */ gboolean g_thread_use_default_impl = TRUE; gboolean g_threads_got_initialized = FALSE; -#if defined(G_PLATFORM_WIN32) && defined(__GNUC__) -__declspec(dllexport) -#endif GThreadFunctions g_thread_functions_for_glib_use = { (GMutex*(*)())g_thread_fail, /* mutex_new */ NULL, /* mutex_lock */ diff --git a/glib/libcharset/localcharset.c b/glib/libcharset/localcharset.c index 7c5dde9..4c8e1b9 100644 --- a/glib/libcharset/localcharset.c +++ b/glib/libcharset/localcharset.c @@ -23,6 +23,13 @@ # include #endif +#include + +#if defined G_PLATFORM_WIN32 +/* Want to use Win32-specific code in this file also on Cygwin */ +# define _WIN32 1 +#endif + #if HAVE_STDDEF_H # include #endif diff --git a/tests/uri-test.c b/tests/uri-test.c index 05c3658..53f6ecb 100644 --- a/tests/uri-test.c +++ b/tests/uri-test.c @@ -61,7 +61,7 @@ to_uri_tests[] = { { "c:\\windows", "otherhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH}, #endif { "etc", "localhost", NULL, G_CONVERT_ERROR_NOT_ABSOLUTE_PATH}, -#ifndef G_OS_WIN32 +#ifndef G_PLATFORM_WIN32 /* g_filename_to_utf8 uses current code page on Win32, these tests assume that * local filenames *are* in UTF-8. */ -- 2.7.4