glib/giowin32.c glib/gmain.c glib/gstrfuncs.c Decorating variable

2004-04-10  Tor Lillqvist  <tml@iki.fi>

	* 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)

diff --git a/ChangeLog b/ChangeLog
index c7a4101c55ebf32fdd0518e565e6b55ae64fbacf..2857ac24d970f3b89e9866c8f0caa58f17220836 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-04-10  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <karunakar@freedomink.org>
 
         * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c7a4101c55ebf32fdd0518e565e6b55ae64fbacf..2857ac24d970f3b89e9866c8f0caa58f17220836 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+2004-04-10  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <karunakar@freedomink.org>
 
         * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c7a4101c55ebf32fdd0518e565e6b55ae64fbacf..2857ac24d970f3b89e9866c8f0caa58f17220836 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,18 @@
+2004-04-10  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <karunakar@freedomink.org>
 
         * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c7a4101c55ebf32fdd0518e565e6b55ae64fbacf..2857ac24d970f3b89e9866c8f0caa58f17220836 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+2004-04-10  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <karunakar@freedomink.org>
 
         * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c7a4101c55ebf32fdd0518e565e6b55ae64fbacf..2857ac24d970f3b89e9866c8f0caa58f17220836 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+2004-04-10  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <karunakar@freedomink.org>
 
         * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c7a4101c55ebf32fdd0518e565e6b55ae64fbacf..2857ac24d970f3b89e9866c8f0caa58f17220836 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+2004-04-10  Tor Lillqvist  <tml@iki.fi>
+
+       * 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  <karunakar@freedomink.org>
 
         * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.

diff --git a/glib/giowin32.c b/glib/giowin32.c
index 152c2c08bc7336104488a923dcc0a908a5ccf9e1..290cc9350b668902b1bd64c86ca5619f45e3afed 100644 (file)
--- 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 00b021491e2503f64643bc853ed5669a1015f8d0..36c9e175f93e8b88fa7f777fdfbbe3210a1582ee 100644 (file)
--- 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 e28f93bcaae9bbf4c69ab37003f6fafc36f43518..ae5d64ac6be7c80ea0a1af3fad4f9cffe262e056 100644 (file)
--- 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 c222beb08cae6d2bab7fb2ed8d541d439a5bdb4a..5d507448efde771a9e03d5274996edc19aa4afc8 100644 (file)
--- 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 7c5dde9517f7700e01082a2586a689210f9aab10..4c8e1b920a0b1eef4d6620106eb1946752476359 100644 (file)
--- a/glib/libcharset/localcharset.c
+++ b/glib/libcharset/localcharset.c
@@ -23,6 +23,13 @@
 # include <config.h>
 #endif
 
+#include <glibconfig.h>
+
+#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 <stddef.h>
 #endif

diff --git a/tests/uri-test.c b/tests/uri-test.c
index 05c3658c3403441cd6dde0659cc3afc906df79dc..53f6ecb03e8b1ff58fbf5013e2ad3c5304173553 100644 (file)
--- 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.
    */