Use hardcoded name for DLL, as there is no reliable way to determine it at

2003-09-29  Tor Lillqvist  <tml@iki.fi>

	* tests/testglib.c (main): Use hardcoded name for DLL, as there is
	no reliable way to determine it at compile or run time anyway.

diff --git a/ChangeLog b/ChangeLog
index d75d43527a3e7453e28e8f0a84e24de638cbc767..cbc779097fa1a6354a454b7a9212fd063e60779d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-29  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/testglib.c (main): Use hardcoded name for DLL, as there is
+       no reliable way to determine it at compile or run time anyway. 
+
 2003-09-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/guniprop.c (g_unichar_get_mirror_char): Add "Since: 2.4" 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d75d43527a3e7453e28e8f0a84e24de638cbc767..cbc779097fa1a6354a454b7a9212fd063e60779d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-09-29  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/testglib.c (main): Use hardcoded name for DLL, as there is
+       no reliable way to determine it at compile or run time anyway. 
+
 2003-09-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/guniprop.c (g_unichar_get_mirror_char): Add "Since: 2.4" 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d75d43527a3e7453e28e8f0a84e24de638cbc767..cbc779097fa1a6354a454b7a9212fd063e60779d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2003-09-29  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/testglib.c (main): Use hardcoded name for DLL, as there is
+       no reliable way to determine it at compile or run time anyway. 
+
 2003-09-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/guniprop.c (g_unichar_get_mirror_char): Add "Since: 2.4" 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d75d43527a3e7453e28e8f0a84e24de638cbc767..cbc779097fa1a6354a454b7a9212fd063e60779d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-09-29  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/testglib.c (main): Use hardcoded name for DLL, as there is
+       no reliable way to determine it at compile or run time anyway. 
+
 2003-09-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/guniprop.c (g_unichar_get_mirror_char): Add "Since: 2.4" 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d75d43527a3e7453e28e8f0a84e24de638cbc767..cbc779097fa1a6354a454b7a9212fd063e60779d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-09-29  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/testglib.c (main): Use hardcoded name for DLL, as there is
+       no reliable way to determine it at compile or run time anyway. 
+
 2003-09-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/guniprop.c (g_unichar_get_mirror_char): Add "Since: 2.4" 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d75d43527a3e7453e28e8f0a84e24de638cbc767..cbc779097fa1a6354a454b7a9212fd063e60779d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-09-29  Tor Lillqvist  <tml@iki.fi>
+
+       * tests/testglib.c (main): Use hardcoded name for DLL, as there is
+       no reliable way to determine it at compile or run time anyway. 
+
 2003-09-29  Matthias Clasen  <maclas@gmx.de>
 
        * glib/guniprop.c (g_unichar_get_mirror_char): Add "Since: 2.4" 

diff --git a/tests/testglib.c b/tests/testglib.c
index 54a9153bda65e0ed2d371a7a540d34ac2c68e517..b2a7995c58e5a947a364ff1c96c23a9a23dc1141 100644 (file)
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -401,16 +401,11 @@ main (int   argc,
   GError *error;
   char *name_used;
 #ifdef G_OS_WIN32
-  gchar *glib_dll = g_strdup_printf ("libglib-%d.%d-%d.dll",
-                                    GLIB_MAJOR_VERSION,
-                                    GLIB_MINOR_VERSION,
-                                    GLIB_MICRO_VERSION - GLIB_BINARY_AGE);
+  /* Can't calculate GLib DLL name at runtime. */
+  gchar *glib_dll = "libglib-2.0-0.dll";
 #endif
 #ifdef G_WITH_CYGWIN
-  gchar *glib_dll = g_strdup_printf ("cygglib-%d.%d-%d.dll",
-                                    GLIB_MAJOR_VERSION,
-                                    GLIB_MINOR_VERSION,
-                                    GLIB_MICRO_VERSION - GLIB_BINARY_AGE);
+  gchar *glib_dll = "cygglib-2.0-0.dll";
 #endif
 
   g_print ("TestGLib v%u.%u.%u (i:%u b:%u)\n",