glib r7259 - trunk/gmodule

[tml svn gnome org]

Author: tml
Date: Sun Jul 27 17:35:46 2008
New Revision: 7259
URL: http://svn.gnome.org/viewvc/glib?rev=7259&view=rev

Log:
2008-07-27  Tor Lillqvist  <tml novell com>

	* gmodule.symbols: New file.

	* gmodule.c: Bypass the Windows ABI compatibility symbols on
	64-bit Windows. Thus no need to keep the file name in system
	codepage around on 64-bit Windows either.
	
	* Makefile.am: Produce gmodule.def from gmodule.symbols. Dist
	gmodule.symbols instead of gmodule.def.

	* gmodule.def: Drop from SVN.



Added:
   trunk/gmodule/gmodule.symbols
Removed:
   trunk/gmodule/gmodule.def
Modified:
   trunk/gmodule/ChangeLog
   trunk/gmodule/Makefile.am
   trunk/gmodule/gmodule.c

Modified: trunk/gmodule/Makefile.am
==============================================================================
--- trunk/gmodule/Makefile.am	(original)
+++ trunk/gmodule/Makefile.am	Sun Jul 27 17:35:46 2008
@@ -9,10 +9,13 @@
 	@GLIB_DEBUG_FLAGS@ 		\
 	-DG_DISABLE_DEPRECATED
 
+gmodule.def: gmodule.symbols
+	(echo -e EXPORTS; $(CPP) -P - <$(srcdir)/gmodule.symbols | sed -e '/^$$/d' -e 's/^/	/') > gmodule.def
+
 EXTRA_DIST +=				\
 		makefile.msc.in 	\
 		gmoduleconf.h.in 	\
-		gmodule.def		\
+		gmodule.symbols		\
 		gmodule-dl.c		\
 		gmodule-dld.c		\
 		gmodule-dyld.c		\

Modified: trunk/gmodule/gmodule.c
==============================================================================
--- trunk/gmodule/gmodule.c	(original)
+++ trunk/gmodule/gmodule.c	Sun Jul 27 17:35:46 2008
@@ -61,7 +61,7 @@
 struct _GModule
 {
   gchar	*file_name;
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined(_WIN64)
   gchar *cp_file_name;
 #endif
   gpointer handle;
@@ -355,7 +355,7 @@
 	    {
 	      main_module = g_new (GModule, 1);
 	      main_module->file_name = NULL;
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined(_WIN64)
 	      main_module->cp_file_name = NULL;
 #endif
 	      main_module->handle = handle;
@@ -470,7 +470,7 @@
       
       module = g_new (GModule, 1);
       module->file_name = g_strdup (file_name);
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined(_WIN64)
       module->cp_file_name = g_locale_from_utf8 (file_name, -1,
 						 NULL, NULL, NULL);
 #endif
@@ -516,7 +516,7 @@
   return module;
 }
 
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined(_WIN64)
 
 #undef g_module_open
 
@@ -580,7 +580,7 @@
       
       _g_module_close (module->handle, FALSE);
       g_free (module->file_name);
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined(_WIN64)
       g_free (module->cp_file_name);
 #endif
       g_free (module);
@@ -659,7 +659,7 @@
   return module->file_name;
 }
 
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined(_WIN64)
 
 #undef g_module_name
 

Added: trunk/gmodule/gmodule.symbols
==============================================================================
--- (empty file)
+++ trunk/gmodule/gmodule.symbols	Sun Jul 27 17:35:46 2008
@@ -0,0 +1,14 @@
+g_module_build_path
+g_module_close
+g_module_error
+g_module_make_resident
+#ifndef _WIN64
+g_module_name PRIVATE
+#endif
+g_module_name_utf8
+#ifndef _WIN64
+g_module_open PRIVATE
+#endif
+g_module_open_utf8
+g_module_supported
+g_module_symbol