glib r7257 - in trunk: . glib
- From: tml svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r7257 - in trunk: . glib
- Date: Sun, 27 Jul 2008 17:15:17 +0000 (UTC)
Author: tml
Date: Sun Jul 27 17:15:16 2008
New Revision: 7257
URL: http://svn.gnome.org/viewvc/glib?rev=7257&view=rev
Log:
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.
Modified:
trunk/ChangeLog
trunk/glib/gconvert.c
trunk/glib/gdir.c
trunk/glib/gfileutils.c
trunk/glib/giowin32.c
trunk/glib/glib.symbols
trunk/glib/gspawn-win32.c
trunk/glib/gutils.c
trunk/glib/gwin32.c
trunk/glib/makegalias.pl
Modified: trunk/glib/gconvert.c
==============================================================================
--- trunk/glib/gconvert.c (original)
+++ trunk/glib/gconvert.c Sun Jul 27 17:15:16 2008
@@ -1331,11 +1331,14 @@
"UTF-8", charset, bytes_read, bytes_written, error);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_filename_to_utf8
-/* Binary compatibility version. Not for newly compiled code. */
+/* Binary compatibility version. Not for newly compiled code. Also not needed for
+ * 64-bit versions as there should be no old deployed binaries that would use
+ * the old versions.
+ */
gchar*
g_filename_to_utf8 (const gchar *opsysstring,
@@ -1396,7 +1399,7 @@
charset, "UTF-8", bytes_read, bytes_written, error);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_filename_from_utf8
@@ -1831,7 +1834,7 @@
return result;
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_filename_from_uri
@@ -1906,7 +1909,7 @@
return escaped_uri;
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_filename_to_uri
Modified: trunk/glib/gdir.c
==============================================================================
--- trunk/glib/gdir.c (original)
+++ trunk/glib/gdir.c Sun Jul 27 17:15:16 2008
@@ -137,7 +137,7 @@
#endif
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* The above function actually is called g_dir_open_utf8, and it's
* that what applications compiled with this GLib version will
@@ -227,7 +227,7 @@
#endif
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* Ditto for g_dir_read_name */
Modified: trunk/glib/gfileutils.c
==============================================================================
--- trunk/glib/gfileutils.c (original)
+++ trunk/glib/gfileutils.c Sun Jul 27 17:15:16 2008
@@ -316,7 +316,7 @@
#endif
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_file_test
@@ -860,7 +860,7 @@
#endif
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_file_get_contents
@@ -1238,7 +1238,7 @@
return create_temp_file (tmpl, 0600);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_mkstemp
@@ -1417,7 +1417,7 @@
return retval;
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_file_open_tmp
Modified: trunk/glib/giowin32.c
==============================================================================
--- trunk/glib/giowin32.c (original)
+++ trunk/glib/giowin32.c Sun Jul 27 17:15:16 2008
@@ -1644,7 +1644,7 @@
return channel;
}
-#ifdef G_OS_WIN32
+#if !defined (_WIN64)
#undef g_io_channel_new_file
Modified: trunk/glib/glib.symbols
==============================================================================
--- trunk/glib/glib.symbols (original)
+++ trunk/glib/glib.symbols Sun Jul 27 17:15:16 2008
@@ -214,10 +214,12 @@
g_locale_to_utf8 G_GNUC_MALLOC
g_filename_display_name G_GNUC_MALLOC
g_filename_display_basename G_GNUC_MALLOC
+#ifndef _WIN64
g_filename_from_uri PRIVATE G_GNUC_MALLOC
g_filename_from_utf8 PRIVATE G_GNUC_MALLOC
g_filename_to_uri PRIVATE G_GNUC_MALLOC
g_filename_to_utf8 PRIVATE G_GNUC_MALLOC
+#endif
#ifdef G_OS_WIN32
g_filename_from_uri_utf8 G_GNUC_MALLOC
g_filename_from_utf8_utf8
@@ -316,8 +318,10 @@
#if IN_HEADER(__G_DIR_H__)
#if IN_FILE(__G_DIR_C__)
g_dir_close
+#ifndef _WIN64
g_dir_open PRIVATE
g_dir_read_name PRIVATE
+#endif
#ifdef G_OS_WIN32
g_dir_open_utf8
g_dir_read_name_utf8
@@ -350,13 +354,19 @@
g_build_pathv G_GNUC_MALLOC
g_file_error_from_errno
g_file_error_quark
+#ifndef _WIN64
g_file_get_contents PRIVATE
+#endif
g_file_set_contents
+#ifndef _WIN64
g_file_open_tmp PRIVATE
g_file_test PRIVATE
+#endif
g_file_read_link
g_format_size_for_display
+#ifndef _WIN64
g_mkstemp PRIVATE
+#endif
g_mkdir_with_parents
#ifdef G_OS_WIN32
g_file_get_contents_utf8
@@ -1057,13 +1067,19 @@
#if IN_HEADER(__G_SPAWN_H__)
#if IN_FILE(__G_SPAWN_C__)
+#ifndef _WIN64
g_spawn_async PRIVATE
g_spawn_async_with_pipes PRIVATE
+#endif
g_spawn_close_pid
+#ifndef _WIN64
g_spawn_command_line_async PRIVATE
g_spawn_command_line_sync PRIVATE
+#endif
g_spawn_error_quark
+#ifndef _WIN64
g_spawn_sync PRIVATE
+#endif
#ifdef G_OS_WIN32
g_spawn_async_utf8
g_spawn_async_with_pipes_utf8
@@ -1474,13 +1490,17 @@
g_basename
#endif
g_get_application_name
+#ifndef _WIN64
g_find_program_in_path PRIVATE
g_get_current_dir PRIVATE
g_getenv PRIVATE
g_unsetenv PRIVATE
g_get_home_dir PRIVATE
+#endif
g_get_host_name
+#ifndef _WIN64
g_setenv PRIVATE
+#endif
g_listenv
#ifdef G_OS_WIN32
g_find_program_in_path_utf8
@@ -1492,7 +1512,9 @@
#endif
g_get_language_names
g_get_prgname
+#ifndef _WIN64
g_get_real_name PRIVATE
+#endif
#ifdef G_OS_WIN32
g_get_real_name_utf8
#endif
@@ -1501,7 +1523,9 @@
#ifdef G_OS_WIN32
g_win32_get_system_data_dirs_for_module
#endif
+#ifndef _WIN64
g_get_tmp_dir PRIVATE
+#endif
#ifdef G_OS_WIN32
g_get_tmp_dir_utf8
#endif
@@ -1509,7 +1533,9 @@
g_get_user_config_dir
g_get_user_data_dir
g_get_user_special_dir
+#ifndef _WIN64
g_get_user_name PRIVATE
+#endif
#ifdef G_OS_WIN32
g_get_user_name_utf8
#endif
@@ -1580,9 +1606,13 @@
g_win32_error_message
g_win32_ftruncate
g_win32_get_package_installation_directory_of_module
+#ifndef _WIN64
g_win32_get_package_installation_directory PRIVATE
+#endif
g_win32_get_package_installation_directory_utf8
+#ifndef _WIN64
g_win32_get_package_installation_subdirectory PRIVATE
+#endif
g_win32_get_package_installation_subdirectory_utf8
g_win32_get_windows_version
g_win32_getlocale
Modified: trunk/glib/gspawn-win32.c
==============================================================================
--- trunk/glib/gspawn-win32.c (original)
+++ trunk/glib/gspawn-win32.c Sun Jul 27 17:15:16 2008
@@ -1227,6 +1227,8 @@
CloseHandle (pid);
}
+#if !defined (_WIN64)
+
/* Binary compatibility versions that take system codepage pathnames,
* argument vectors and environments. These get used only by code
* built against 2.8.1 or earlier. Code built against 2.8.2 or later
@@ -1492,6 +1494,8 @@
return retval;
}
+#endif /* !_WIN64 */
+
#endif /* !GSPAWN_HELPER */
#define __G_SPAWN_C__
Modified: trunk/glib/gutils.c
==============================================================================
--- trunk/glib/gutils.c (original)
+++ trunk/glib/gutils.c Sun Jul 27 17:15:16 2008
@@ -3286,7 +3286,7 @@
return g_dgettext (GETTEXT_PACKAGE, str);
}
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && !defined (_WIN64)
/* Binary compatibility versions. Not for newly compiled code. */
Modified: trunk/glib/gwin32.c
==============================================================================
--- trunk/glib/gwin32.c (original)
+++ trunk/glib/gwin32.c Sun Jul 27 17:15:16 2008
@@ -442,6 +442,8 @@
return result;
}
+#if !defined (_WIN64)
+
#undef g_win32_get_package_installation_directory
/* DLL ABI binary compatibility version that uses system codepage file names */
@@ -472,6 +474,8 @@
return retval;
}
+#endif
+
/**
* g_win32_get_package_installation_subdirectory:
* @package: You should pass %NULL for this.
@@ -512,6 +516,8 @@
return dirname;
}
+#if !defined (_WIN64)
+
#undef g_win32_get_package_installation_subdirectory
/* DLL ABI binary compatibility version that uses system codepage file names */
@@ -532,6 +538,8 @@
return dirname;
}
+#endif
+
static guint windows_version;
static void
Modified: trunk/glib/makegalias.pl
==============================================================================
--- trunk/glib/makegalias.pl (original)
+++ trunk/glib/makegalias.pl Sun Jul 27 17:15:16 2008
@@ -83,7 +83,7 @@
next;
}
- if ($_ =~ /^\#ifn?def\s+(G|DISABLE_MEM_POOLS)/)
+ if ($_ =~ /^\#ifn?def\s+(G|DISABLE_MEM_POOLS|_WIN64)/)
{
print $_;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]