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
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>
@GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED
@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 \
EXTRA_DIST += \
makefile.msc.in \
gmoduleconf.h.in \
gmodule-dl.c \
gmodule-dld.c \
gmodule-dyld.c \
gmodule-dl.c \
gmodule-dld.c \
gmodule-dyld.c \
struct _GModule
{
gchar *file_name;
struct _GModule
{
gchar *file_name;
+#if defined (G_OS_WIN32) && !defined(_WIN64)
gchar *cp_file_name;
#endif
gpointer handle;
gchar *cp_file_name;
#endif
gpointer handle;
{
main_module = g_new (GModule, 1);
main_module->file_name = NULL;
{
main_module = g_new (GModule, 1);
main_module->file_name = NULL;
+#if defined (G_OS_WIN32) && !defined(_WIN64)
main_module->cp_file_name = NULL;
#endif
main_module->handle = handle;
main_module->cp_file_name = NULL;
#endif
main_module->handle = handle;
module = g_new (GModule, 1);
module->file_name = g_strdup (file_name);
module = g_new (GModule, 1);
module->file_name = g_strdup (file_name);
+#if defined (G_OS_WIN32) && !defined(_WIN64)
module->cp_file_name = g_locale_from_utf8 (file_name, -1,
NULL, NULL, NULL);
#endif
module->cp_file_name = g_locale_from_utf8 (file_name, -1,
NULL, NULL, NULL);
#endif
+#if defined (G_OS_WIN32) && !defined(_WIN64)
_g_module_close (module->handle, FALSE);
g_free (module->file_name);
_g_module_close (module->handle, FALSE);
g_free (module->file_name);
+#if defined (G_OS_WIN32) && !defined(_WIN64)
g_free (module->cp_file_name);
#endif
g_free (module);
g_free (module->cp_file_name);
#endif
g_free (module);
return module->file_name;
}
return module->file_name;
}
+#if defined (G_OS_WIN32) && !defined(_WIN64)
+++ /dev/null
-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
--- /dev/null
+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