+2004-10-26 Matthias Clasen <mclasen@redhat.com>
+
+ * glib/gwin32.c (g_win32_get_windows_version): Make this
+ function thread-safe in the GLib style.
+ * glib/gthreadinit.h:
+ * glib/gwin32.c (_g_win32_thread_init): New function to
+ initialize the version.
+ * glib/gthread.c (g_thread_init_glib): Call
+ _g_win32_thread_init() from here.
+
2004-10-26 Ray Strode <rstrode@redhat.com>
* glib/gkeyfile.c: Add Matthias to "Written by" lines
+2004-10-26 Matthias Clasen <mclasen@redhat.com>
+
+ * glib/gwin32.c (g_win32_get_windows_version): Make this
+ function thread-safe in the GLib style.
+ * glib/gthreadinit.h:
+ * glib/gwin32.c (_g_win32_thread_init): New function to
+ initialize the version.
+ * glib/gthread.c (g_thread_init_glib): Call
+ _g_win32_thread_init() from here.
+
2004-10-26 Ray Strode <rstrode@redhat.com>
* glib/gkeyfile.c: Add Matthias to "Written by" lines
+2004-10-26 Matthias Clasen <mclasen@redhat.com>
+
+ * glib/gwin32.c (g_win32_get_windows_version): Make this
+ function thread-safe in the GLib style.
+ * glib/gthreadinit.h:
+ * glib/gwin32.c (_g_win32_thread_init): New function to
+ initialize the version.
+ * glib/gthread.c (g_thread_init_glib): Call
+ _g_win32_thread_init() from here.
+
2004-10-26 Ray Strode <rstrode@redhat.com>
* glib/gkeyfile.c: Add Matthias to "Written by" lines
+2004-10-26 Matthias Clasen <mclasen@redhat.com>
+
+ * glib/gwin32.c (g_win32_get_windows_version): Make this
+ function thread-safe in the GLib style.
+ * glib/gthreadinit.h:
+ * glib/gwin32.c (_g_win32_thread_init): New function to
+ initialize the version.
+ * glib/gthread.c (g_thread_init_glib): Call
+ _g_win32_thread_init() from here.
+
2004-10-26 Ray Strode <rstrode@redhat.com>
* glib/gkeyfile.c: Add Matthias to "Written by" lines
+2004-10-26 Matthias Clasen <mclasen@redhat.com>
+
+ * glib/gwin32.c (g_win32_get_windows_version): Make this
+ function thread-safe in the GLib style.
+ * glib/gthreadinit.h:
+ * glib/gwin32.c (_g_win32_thread_init): New function to
+ initialize the version.
+ * glib/gthread.c (g_thread_init_glib): Call
+ _g_win32_thread_init() from here.
+
2004-10-26 Ray Strode <rstrode@redhat.com>
* glib/gkeyfile.c: Add Matthias to "Written by" lines
_g_mem_thread_init ();
_g_messages_thread_init ();
_g_atomic_thread_init ();
+ _g_win32_thread_init ();
g_threads_got_initialized = TRUE;
void _g_rand_thread_init (void) G_GNUC_INTERNAL;
void _g_main_thread_init (void) G_GNUC_INTERNAL;
void _g_atomic_thread_init (void) G_GNUC_INTERNAL;
+void _g_win32_thread_init (void) G_GNUC_INTERNAL;
/* Are called from glib/gthread.c. Must only contain g_private_new calls */
void _g_mem_thread_private_init (void) G_GNUC_INTERNAL;
return dirname;
}
-guint
-g_win32_get_windows_version (void)
+static guint windows_version;
+
+static void
+g_win32_windows_version_init (void)
{
static gboolean beenhere = FALSE;
- static guint version;
if (!beenhere)
{
+ beenhere = TRUE;
if (getenv ("G_WIN32_PRETEND_WIN9X"))
- version = 0x80000004;
+ windows_version = 0x80000004;
else
- version = GetVersion ();
- beenhere = TRUE;
+ windows_version = GetVersion ();
}
- return version;
+}
+
+void
+_g_win32_thread_init (void)
+{
+ g_win32_windows_version_init ();
+}
+
+guint
+g_win32_get_windows_version (void)
+{
+ g_win32_windows_version_init ();
+
+ return windows_version;
}