Merge in current Win32 version. Almost no Unix code touched.

	* README.win32: More text.

	* config.h.win32 glibconfig.h.win32: Update to match the
	corresponding generated files on Unix.

	* makefile.msc: Update with new source files, and gthread
 	library. Use the compiler flag -MD instead of using -D_DLL and
	"/nodefaultlib:libc msvcrt.lib" in the link phase.

	* glib.def: Include new functions, drop removed ones.

	* glib.h: Add comments about main loop and polling on Win32. (In
	general, it's only for the GIMP's use.) Add Win32 IO Channel
	functions. Remove the obsoleted old IO Channel stuff (which was
	in #if 0 already).

	* giowin32.c: New file.

	* gmain.c: Include config.h, conditionalize <sys/time.h>
 	inclusion.  Add g_poll implementation for Win32 (only for the
 	GIMP's needs for now, it's hard or even impossible to be as clean
 	and generic as on Unix). Implement g_get_current_time on Win32. If
 	threads aren't supported, don't try to wake up main thread's
 	loop. On Win32, use a semaphore and not a pipe to wake up the main
 	loop.

	* gmessages.c: On Win32, allocate a console window if the standard
	output handle is invalid before writing to stdout, and reopen stdout
	to that console window.

	* giochannel.c: Conditionalize unistd.h inclusion. Some indentation
	cleanup.

	* gstrfuncs.c: Include <signal.h>.

	* gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH
	environment variables.

	* gmodule-dl.c gmodule-dld.c: In
 	_g_module_build_path, don't add the "lib" prefix and
 	".so" or ".sl" suffix if already there.

	* gmodule-win32.c: Likewise for the ".dll" suffix.

	* gthread-posix.c: Conditionalize <sys/time.h> inclusion.

4 files changed, 33 insertions, 7 deletions

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 86dd222ae..e90408a33 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,11 @@
+1999-01-16  Tor Lillqvist  <tml@iki.fi>
+
+	* gmodule-dl.c gmodule-dld.c: In
+ 	_g_module_build_path, don't add the "lib" prefix and
+ 	".so" or ".sl" suffix if already there.
+
+	* gmodule-win32.c: Likewise for the ".dll" suffix.
+
 1998-12-10  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gmodule.c: Made it MT safe, the g_module_error() is now thread
diff --git a/gmodule/gmodule-dl.c b/gmodule/gmodule-dl.c
index 4a5686616..e8c986fc7 100644
--- a/gmodule/gmodule-dl.c
+++ b/gmodule/gmodule-dl.c
@@ -125,8 +125,13 @@ static gchar*
 _g_module_build_path (const gchar *directory,
 		      const gchar *module_name)
 {
-  if (directory)
-    return g_strconcat (directory, "/lib", module_name, ".so", NULL);
+  if (directory && *directory)
+    if (strncmp (module_name, "lib", 3) == 0)
+      return g_strconcat (directory, "/", module_name, NULL);
+    else
+      return g_strconcat (directory, "/lib", module_name, ".so", NULL);
+  else if (strncmp (module_name, "lib", 3) == 0)
+    return g_strdup (module_name);
   else
     return g_strconcat ("lib", module_name, ".so", NULL);
 }
diff --git a/gmodule/gmodule-dld.c b/gmodule/gmodule-dld.c
index 53b269b48..17d6e010e 100644
--- a/gmodule/gmodule-dld.c
+++ b/gmodule/gmodule-dld.c
@@ -122,8 +122,13 @@ static gchar*
 _g_module_build_path (const gchar *directory,
 		      const gchar *module_name)
 {
-  if (directory)
-    return g_strconcat (directory, "/", module_name, ".sl", NULL);
+  if (directory && *directory)
+    if (strncmp (module_name, "lib", 3) == 0)
+      return g_strconcat (directory, "/", module_name, NULL);
+    else
+      return g_strconcat (directory, "/lib", module_name, ".sl", NULL);
+  else if (strncmp (module_name, "lib", 3) == 0)
+    return g_strdup (module_name);
   else
-    return g_strconcat (module_name, ".sl", NULL);
+    return g_strconcat ("lib", module_name, ".sl", NULL);
 }
diff --git a/gmodule/gmodule-win32.c b/gmodule/gmodule-win32.c
index 98643ad23..c3fc9a90d 100644
--- a/gmodule/gmodule-win32.c
+++ b/gmodule/gmodule-win32.c
@@ -91,8 +91,16 @@ static gchar*
 _g_module_build_path (const gchar *directory,
 		      const gchar *module_name)
 {
-  if (directory)
-    return g_strconcat (directory, "\\", module_name, ".dll", NULL);
+  gint k;
+
+  k = strlen (module_name);
+  if (directory && *directory)
+    if (k > 4 && g_strcasecmp (module_name + k - 4, ".dll") == 0)
+      return g_strconcat (directory, "\\", module_name, NULL);
+    else
+      return g_strconcat (directory, "\\", module_name, ".dll", NULL);
+  else if (k > 4 && g_strcasecmp (module_name + k - 4, ".dll") == 0)
+    return g_strdup (module_name);
   else
     return g_strconcat (module_name, ".dll", NULL);
 }