summaryrefslogtreecommitdiff
path: root/testglib.c
diff options
context:
space:
mode:
Diffstat (limited to 'testglib.c')
-rw-r--r--testglib.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/testglib.c b/testglib.c
index 1e1adf3ce..4617487d6 100644
--- a/testglib.c
+++ b/testglib.c
@@ -46,8 +46,8 @@
#include <io.h> /* For read(), write() etc */
#endif
-int array[10000];
-gboolean failed = FALSE;
+static int array[10000];
+static gboolean failed = FALSE;
#define TEST(m,cond) G_STMT_START { failed = !(cond); \
if (failed) \
@@ -351,6 +351,9 @@ main (int argc,
{ "a\\b\\", "a\\b" },
{ "c\\\\\\", "c" },
#endif
+#ifdef G_WITH_CYGWIN
+ { "//server/share///x", "//server/share" },
+#endif
{ ".", "." },
{ "..", "." },
{ "", "." },
@@ -374,6 +377,9 @@ main (int argc,
{ "\\\\server\\foo\\bar", "bar" },
{ "a\\b", NULL },
#endif
+#ifdef G_WITH_CYGWIN
+ { "//server/share///x", "//x" },
+#endif
{ ".", NULL },
{ "", NULL },
};
@@ -397,6 +403,11 @@ main (int argc,
GLIB_MAJOR_VERSION,
GLIB_MINOR_VERSION);
#endif
+#ifdef G_WITH_CYGWIN
+ gchar *glib_dll = g_strdup_printf ("cygglib-%d.%d.dll",
+ GLIB_MAJOR_VERSION,
+ GLIB_MINOR_VERSION);
+#endif
g_print ("TestGLib v%u.%u.%u (i:%u b:%u)\n",
glib_major_version,
@@ -1151,7 +1162,7 @@ main (int argc,
g_print ("ok\n");
-#ifdef G_OS_WIN32
+#ifdef G_PLATFORM_WIN32
g_print ("current locale: %s\n", g_win32_getlocale ());
g_print ("GLib installation directory, from Registry entry for %s if available: %s\n",