From 1dc5f94cfa2078889801d9ecf35c8778153df3d7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 5 Oct 1999 16:21:07 +0000 Subject: [PATCH] Use G_OS_WIN32. * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. * glib.def: Add g_thread_use_default_impl. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ glib.def | 1 + glib/glib.def | 1 + tests/dirname-test.c | 2 +- tests/string-test.c | 2 +- 12 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2570d2c..d0f1b78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,10 @@ * build-dll: Don't strip. + * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. + + * glib.def: Add g_thread_use_default_impl. + Sun Oct 3 19:46:55 PDT 1999 Manish Singh * configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2570d2c..d0f1b78 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -12,6 +12,10 @@ * build-dll: Don't strip. + * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. + + * glib.def: Add g_thread_use_default_impl. + Sun Oct 3 19:46:55 PDT 1999 Manish Singh * configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2570d2c..d0f1b78 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -12,6 +12,10 @@ * build-dll: Don't strip. + * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. + + * glib.def: Add g_thread_use_default_impl. + Sun Oct 3 19:46:55 PDT 1999 Manish Singh * configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2570d2c..d0f1b78 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -12,6 +12,10 @@ * build-dll: Don't strip. + * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. + + * glib.def: Add g_thread_use_default_impl. + Sun Oct 3 19:46:55 PDT 1999 Manish Singh * configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2570d2c..d0f1b78 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -12,6 +12,10 @@ * build-dll: Don't strip. + * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. + + * glib.def: Add g_thread_use_default_impl. + Sun Oct 3 19:46:55 PDT 1999 Manish Singh * configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2570d2c..d0f1b78 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -12,6 +12,10 @@ * build-dll: Don't strip. + * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. + + * glib.def: Add g_thread_use_default_impl. + Sun Oct 3 19:46:55 PDT 1999 Manish Singh * configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2570d2c..d0f1b78 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -12,6 +12,10 @@ * build-dll: Don't strip. + * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. + + * glib.def: Add g_thread_use_default_impl. + Sun Oct 3 19:46:55 PDT 1999 Manish Singh * configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2570d2c..d0f1b78 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -12,6 +12,10 @@ * build-dll: Don't strip. + * tests/string-test.c tests/dirname-test.c: Use G_OS_WIN32. + + * glib.def: Add g_thread_use_default_impl. + Sun Oct 3 19:46:55 PDT 1999 Manish Singh * configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN diff --git a/glib.def b/glib.def index 654e071..98b371f 100644 --- a/glib.def +++ b/glib.def @@ -410,6 +410,7 @@ EXPORTS g_thread_join g_thread_self g_thread_set_priority + g_thread_use_default_impl g_threads_got_initialized g_timeout_add g_timeout_add_full diff --git a/glib/glib.def b/glib/glib.def index 654e071..98b371f 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -410,6 +410,7 @@ EXPORTS g_thread_join g_thread_self g_thread_set_priority + g_thread_use_default_impl g_threads_got_initialized g_timeout_add g_timeout_add_full diff --git a/tests/dirname-test.c b/tests/dirname-test.c index 8bb05b3..a4499d5 100644 --- a/tests/dirname-test.c +++ b/tests/dirname-test.c @@ -59,7 +59,7 @@ main (int argc, gchar *filename; gchar *dirname; } dirname_checks[] = { -#ifndef NATIVE_WIN32 +#ifndef G_OS_WIN32 { "/", "/" }, { "////", "/" }, { ".////", "." }, diff --git a/tests/string-test.c b/tests/string-test.c index b2c7c1d..4502f97 100644 --- a/tests/string-test.c +++ b/tests/string-test.c @@ -103,7 +103,7 @@ main (int argc, g_assert((strlen("hi pete!") + 10000) == string1->len); g_assert((strlen("hi pete!") + 10000) == strlen(string1->str)); -#ifndef NATIVE_WIN32 +#ifndef G_OS_WIN32 /* MSVC and mingw32 use the same run-time C library, which doesn't like the %10000.10000f format... */ g_string_sprintf (string2, "%s|%0100d|%s|%s|%0*d|%*.*f|%10000.10000f", -- 2.7.4