diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-08-29 22:45:00 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-08-29 22:45:00 +0000 |
| commit | da422c0060dc4a8b51c4d6a5a43c4f7ff76056b6 (patch) | |
| tree | 58637580c0ad8a7bf26ec01b205286761b6feda9 /gmodule | |
| parent | 08e3a830fbfa0474057bede11c7c95d599b6da2d (diff) | |
Remove support for Windows 9x/ME, as will be done also in Pango and GTK+.
2006-08-29 Tor Lillqvist <tml@novell.com>
Remove support for Windows 9x/ME, as will be done also in Pango
and GTK+. GTK+ hasn't worked on Win9x since 2.6 or 2.8 anyway, so
it's pretty pointless to keep the Win9x code in here either. If
somebody is interested, the code can always be found in older GLib
versions, and in CVS.
* glib/gdir.c
* glib/gfileutils.c
* glib/gspawn-win32-helper.c
* glib/gspawn-win32.c
* glib/gstdio.c
* glib/gutils.c
* glib/gwin32.c
* glib/gwin32.h: Remove the G_WIN32_IS_NT_BASED() and
G_WIN32_HAVE_WIDECHAR_API() tests and their false (Win9x)
branches, and any variables or static functions used only by the
Win9x branches.
* glib/gwin32.c (g_win32_windows_version_init): Call g_error() if
run on Win9x.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/ChangeLog | 10 | ||||
| -rw-r--r-- | gmodule/gmodule-win32.c | 17 |
2 files changed, 14 insertions, 13 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 74c436466..4d8ded6f7 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,13 @@ +2006-08-29 Tor Lillqvist <tml@novell.com> + + Remove support for Windows 9x/ME. GTK+ hasn't worked on Win9x + since 2.6. It's pointless to keep the Win9x code in here as it + isn't being maintained anyway. If somebody is interested, it is in + older GLib versions, and in CVS. + + * gmodule-win32.c (_g_module_open): Remove the Win9x branch of if + statement. + 2006-08-15 Matthias Clasen <mclasen@redhat.com> * === Released 2.12.2 === diff --git a/gmodule/gmodule-win32.c b/gmodule/gmodule-win32.c index bf6309138..3e8fe02fe 100644 --- a/gmodule/gmodule-win32.c +++ b/gmodule/gmodule-win32.c @@ -56,26 +56,17 @@ _g_module_open (const gchar *file_name, gboolean bind_local) { HINSTANCE handle; + wchar_t *wfilename; #ifdef G_WITH_CYGWIN gchar tmp[MAX_PATH]; cygwin_conv_to_win32_path(file_name, tmp); file_name = tmp; #endif - if (G_WIN32_HAVE_WIDECHAR_API ()) - { - wchar_t *wfilename = g_utf8_to_utf16 (file_name, -1, NULL, NULL, NULL); - - handle = LoadLibraryW (wfilename); - g_free (wfilename); - } - else - { - gchar *cp_filename = g_locale_from_utf8 (file_name, -1, NULL, NULL, NULL); + wfilename = g_utf8_to_utf16 (file_name, -1, NULL, NULL, NULL); - handle = LoadLibraryA (cp_filename); - g_free (cp_filename); - } + handle = LoadLibraryW (wfilename); + g_free (wfilename); if (!handle) set_error (); |