luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 18:26:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

New file.

Browse Source 
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.


svn path=/trunk/; revision=7259
This commit is contained in:
Tor Lillqvist 2008-07-27 17:35:46 +00:00 committed by Tor Lillqvist
parent bd78e09057
commit 168c4d4708
5 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gmodule/ChangeLog
View File

@ -1,6 +1,20 @@
2008-07-27 Tor Lillqvist <tml@novell.com> 2008-07-27 Tor Lillqvist <tml@novell.com>
* Makefile.am (gmodule-2.0.lib): Pass appropriate -machine flag to lib.exe. * 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.
2008-07-27 Tor Lillqvist <tml@novell.com>
* Makefile.am (gmodule-2.0.lib): Pass appropriate -machine flag to
lib.exe.
2008-07-21 Matthias Clasen <mclasen2redhat.com> 2008-07-21 Matthias Clasen <mclasen2redhat.com>

5
gmodule/Makefile.am
View File

@ -9,10 +9,13 @@ AM_CPPFLAGS = \
@GLIB_DEBUG_FLAGS@ \ @GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED
gmodule.def: gmodule.symbols
(echo -e EXPORTS; $(CPP) -P - <$(srcdir)/gmodule.symbols | sed -e '/^$$/d' -e 's/^/ /') > gmodule.def
EXTRA_DIST += \ EXTRA_DIST += \
makefile.msc.in \ makefile.msc.in \
gmoduleconf.h.in \ gmoduleconf.h.in \
gmodule.def \ gmodule.symbols \
gmodule-dl.c \ gmodule-dl.c \
gmodule-dld.c \ gmodule-dld.c \
gmodule-dyld.c \ gmodule-dyld.c \

12
gmodule/gmodule.c
View File

@ -61,7 +61,7 @@
struct _GModule struct _GModule
{ {
gchar *file_name; gchar *file_name;
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined(_WIN64)
gchar *cp_file_name; gchar *cp_file_name;
#endif #endif
gpointer handle; gpointer handle;
@ -355,7 +355,7 @@ g_module_open (const gchar *file_name,
{ {
main_module = g_new (GModule, 1); main_module = g_new (GModule, 1);
main_module->file_name = NULL; main_module->file_name = NULL;
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined(_WIN64)
main_module->cp_file_name = NULL; main_module->cp_file_name = NULL;
#endif #endif
main_module->handle = handle; main_module->handle = handle;
@ -470,7 +470,7 @@ g_module_open (const gchar *file_name,
module = g_new (GModule, 1); module = g_new (GModule, 1);
module->file_name = g_strdup (file_name); 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, module->cp_file_name = g_locale_from_utf8 (file_name, -1,
NULL, NULL, NULL); NULL, NULL, NULL);
#endif #endif
@ -516,7 +516,7 @@ g_module_open (const gchar *file_name,
return module; return module;
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined(_WIN64)
#undef g_module_open #undef g_module_open
@ -580,7 +580,7 @@ g_module_close (GModule *module)
_g_module_close (module->handle, FALSE); _g_module_close (module->handle, FALSE);
g_free (module->file_name); g_free (module->file_name);
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined(_WIN64)
g_free (module->cp_file_name); g_free (module->cp_file_name);
#endif #endif
g_free (module); g_free (module);
@ -659,7 +659,7 @@ g_module_name (GModule *module)
return module->file_name; return module->file_name;
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined(_WIN64)
#undef g_module_name #undef g_module_name

11
gmodule/gmodule.def
View File

@ -1,11 +0,0 @@
EXPORTS
g_module_build_path
g_module_close
g_module_error
g_module_make_resident
g_module_name PRIVATE
g_module_name_utf8
g_module_open PRIVATE
g_module_open_utf8
g_module_supported
g_module_symbol

14
gmodule/gmodule.symbols Normal file
View File

@ -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