diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-08-08 03:49:18 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-08-08 03:49:18 +0000 |
| commit | 729524185b209792ac25e91e8b59c25bcede74fa (patch) | |
| tree | a5886647cd2a45d46ee987f745c23fabfb4749f1 /gtk/gtkiconfactory.c | |
| parent | 28e08b7e8d8e6b3a8ce5244bad384719c33318f6 (diff) | |
| download | gtk+-729524185b209792ac25e91e8b59c25bcede74fa.tar.gz | |
gtk/gtk.symbols gtk/makegtkalias.pl gtk/gtkaccelmap.c gtk/gtkfilechooser.c
2008-08-08 Tor Lillqvist <tml@novell.com>
* gtk/gtk.symbols
* gtk/makegtkalias.pl
* gtk/gtkaccelmap.c
* gtk/gtkfilechooser.c
* gtk/gtkfilesel.c
* gtk/gtkiconfactory.c
* gtk/gtkicontheme.c
* gtk/gtkimage.c
* gtk/gtkrc.c
* gtk/gtkuimanager.c
* gtk/gtkwindow.c: No need for the DLL ABI backward compatibility
functions on Win64.
svn path=/trunk/; revision=21040
Diffstat (limited to 'gtk/gtkiconfactory.c')
| -rw-r--r-- | gtk/gtkiconfactory.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 43773e4f91..d7818398d6 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -75,7 +75,7 @@ struct _GtkIconSource guint any_state : 1; guint any_size : 1; -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) /* System codepage version of filename, for DLL ABI backward * compatibility functions. */ @@ -1925,7 +1925,7 @@ gtk_icon_source_copy (const GtkIconSource *source) break; case GTK_ICON_SOURCE_FILENAME: copy->source.filename = g_strdup (copy->source.filename); -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) copy->cp_filename = g_strdup (copy->cp_filename); #endif if (copy->filename_pixbuf) @@ -1986,7 +1986,7 @@ icon_source_clear (GtkIconSource *source) case GTK_ICON_SOURCE_FILENAME: g_free (source->source.filename); source->source.filename = NULL; -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) g_free (source->cp_filename); source->cp_filename = NULL; #endif @@ -2030,7 +2030,7 @@ gtk_icon_source_set_filename (GtkIconSource *source, { source->type = GTK_ICON_SOURCE_FILENAME; source->source.filename = g_strdup (filename); -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) source->cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL); #endif } @@ -2980,7 +2980,7 @@ gtk_icon_factory_buildable_custom_tag_end (GtkBuildable *buildable, } } -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) /* DLL ABI stability backward compatibility versions */ |