diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-07-27 17:15:16 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-07-27 17:15:16 +0000 |
| commit | 80ecc30841e4741dae3a5dac7e8ff2889b7b096e (patch) | |
| tree | 27f16a55cc8098f2ad172837d3a4b3535da23a0a /glib/gfileutils.c | |
| parent | e5e4f8bca3d47dd6db384cc62c225faa469d66db (diff) | |
| download | glib-80ecc30841e4741dae3a5dac7e8ff2889b7b096e.tar.gz | |
glib/glib.symbols glib/gconvert.c glib/gdir.c glib/gfileutils.c
2008-07-27 Tor Lillqvist <tml@novell.com>
* glib/glib.symbols
* glib/gconvert.c
* glib/gdir.c
* glib/gfileutils.c
* glib/giowin32.c
* glib/gspawn-win32.c
* glib/gutils.c
* glib/gwin32.c: Bypass the Windows "ABI compatibility" symbols on
_WIN64. As there hasn't been any widely deployed 64-bit Windows
builds of the really old GLib (pre-2.8.1) versions those refer to,
there is no need to have the "ABI compatibility" versions in the
DLL.
* glib/makegalias.pl: Handle #ifndef _WIN64: Just output it, too.
svn path=/trunk/; revision=7257
Diffstat (limited to 'glib/gfileutils.c')
| -rw-r--r-- | glib/gfileutils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glib/gfileutils.c b/glib/gfileutils.c index 20df7373e..34ecc6495 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -316,7 +316,7 @@ g_file_test (const gchar *filename, #endif } -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) #undef g_file_test @@ -860,7 +860,7 @@ g_file_get_contents (const gchar *filename, #endif } -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) #undef g_file_get_contents @@ -1238,7 +1238,7 @@ g_mkstemp (gchar *tmpl) return create_temp_file (tmpl, 0600); } -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) #undef g_mkstemp @@ -1417,7 +1417,7 @@ g_file_open_tmp (const gchar *tmpl, return retval; } -#ifdef G_OS_WIN32 +#if defined (G_OS_WIN32) && !defined (_WIN64) #undef g_file_open_tmp |