luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib/glib.symbols glib/gconvert.c glib/gdir.c glib/gfileutils.c

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2008-07-27 17:15:16 +00:00 committed by Tor Lillqvist
parent e5e4f8bca3
commit 80ecc30841
10 changed files with 76 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
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.
2008-07-27 Tor Lillqvist <tml@novell.com> 2008-07-27 Tor Lillqvist <tml@novell.com>
* configure.in: Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on * configure.in: Set LIB_EXE_MACHINE_FLAG to either X86 or X64 on

13
glib/gconvert.c
View File

@ -1331,11 +1331,14 @@ g_filename_to_utf8 (const gchar *opsysstring,
"UTF-8", charset, bytes_read, bytes_written, error); "UTF-8", charset, bytes_read, bytes_written, error);
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_filename_to_utf8 #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* gchar*
g_filename_to_utf8 (const gchar *opsysstring, g_filename_to_utf8 (const gchar *opsysstring,
@ -1396,7 +1399,7 @@ g_filename_from_utf8 (const gchar *utf8string,
charset, "UTF-8", bytes_read, bytes_written, error); charset, "UTF-8", bytes_read, bytes_written, error);
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_filename_from_utf8 #undef g_filename_from_utf8
@ -1831,7 +1834,7 @@ g_filename_from_uri (const gchar *uri,
return result; return result;
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_filename_from_uri #undef g_filename_from_uri
@ -1906,7 +1909,7 @@ g_filename_to_uri (const gchar *filename,
return escaped_uri; return escaped_uri;
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_filename_to_uri #undef g_filename_to_uri

4
glib/gdir.c
View File

@ -137,7 +137,7 @@ g_dir_open (const gchar *path,
#endif #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 /* The above function actually is called g_dir_open_utf8, and it's
* that what applications compiled with this GLib version will * that what applications compiled with this GLib version will
@ -227,7 +227,7 @@ g_dir_read_name (GDir *dir)
#endif #endif
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
/* Ditto for g_dir_read_name */ /* Ditto for g_dir_read_name */

8
glib/gfileutils.c
View File

@ -316,7 +316,7 @@ g_file_test (const gchar *filename,
#endif #endif
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_file_test #undef g_file_test
@ -860,7 +860,7 @@ g_file_get_contents (const gchar *filename,
#endif #endif
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_file_get_contents #undef g_file_get_contents
@ -1238,7 +1238,7 @@ g_mkstemp (gchar *tmpl)
return create_temp_file (tmpl, 0600); return create_temp_file (tmpl, 0600);
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_mkstemp #undef g_mkstemp
@ -1417,7 +1417,7 @@ g_file_open_tmp (const gchar *tmpl,
return retval; return retval;
} }
#ifdef G_OS_WIN32 #if defined (G_OS_WIN32) && !defined (_WIN64)
#undef g_file_open_tmp #undef g_file_open_tmp

2
glib/giowin32.c
View File

@ -1644,7 +1644,7 @@ g_io_channel_new_file (const gchar *filename,
return channel; return channel;
} }
#ifdef G_OS_WIN32 #if !defined (_WIN64)
#undef g_io_channel_new_file #undef g_io_channel_new_file

30
glib/glib.symbols
View File

@ -214,10 +214,12 @@ g_locale_from_utf8 G_GNUC_MALLOC
g_locale_to_utf8 G_GNUC_MALLOC g_locale_to_utf8 G_GNUC_MALLOC
g_filename_display_name G_GNUC_MALLOC g_filename_display_name G_GNUC_MALLOC
g_filename_display_basename G_GNUC_MALLOC g_filename_display_basename G_GNUC_MALLOC
#ifndef _WIN64
g_filename_from_uri PRIVATE G_GNUC_MALLOC g_filename_from_uri PRIVATE G_GNUC_MALLOC
g_filename_from_utf8 PRIVATE G_GNUC_MALLOC g_filename_from_utf8 PRIVATE G_GNUC_MALLOC
g_filename_to_uri PRIVATE G_GNUC_MALLOC g_filename_to_uri PRIVATE G_GNUC_MALLOC
g_filename_to_utf8 PRIVATE G_GNUC_MALLOC g_filename_to_utf8 PRIVATE G_GNUC_MALLOC
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_filename_from_uri_utf8 G_GNUC_MALLOC g_filename_from_uri_utf8 G_GNUC_MALLOC
g_filename_from_utf8_utf8 g_filename_from_utf8_utf8
@ -316,8 +318,10 @@ g_date_valid_year G_GNUC_CONST
#if IN_HEADER(__G_DIR_H__) #if IN_HEADER(__G_DIR_H__)
#if IN_FILE(__G_DIR_C__) #if IN_FILE(__G_DIR_C__)
g_dir_close g_dir_close
#ifndef _WIN64
g_dir_open PRIVATE g_dir_open PRIVATE
g_dir_read_name PRIVATE g_dir_read_name PRIVATE
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_dir_open_utf8 g_dir_open_utf8
g_dir_read_name_utf8 g_dir_read_name_utf8
@ -350,13 +354,19 @@ g_build_path G_GNUC_MALLOC G_GNUC_NULL_TERMINATED
g_build_pathv G_GNUC_MALLOC g_build_pathv G_GNUC_MALLOC
g_file_error_from_errno g_file_error_from_errno
g_file_error_quark g_file_error_quark
#ifndef _WIN64
g_file_get_contents PRIVATE g_file_get_contents PRIVATE
#endif
g_file_set_contents g_file_set_contents
#ifndef _WIN64
g_file_open_tmp PRIVATE g_file_open_tmp PRIVATE
g_file_test PRIVATE g_file_test PRIVATE
#endif
g_file_read_link g_file_read_link
g_format_size_for_display g_format_size_for_display
#ifndef _WIN64
g_mkstemp PRIVATE g_mkstemp PRIVATE
#endif
g_mkdir_with_parents g_mkdir_with_parents
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_file_get_contents_utf8 g_file_get_contents_utf8
@ -1057,13 +1067,19 @@ g_slist_sort_with_data
#if IN_HEADER(__G_SPAWN_H__) #if IN_HEADER(__G_SPAWN_H__)
#if IN_FILE(__G_SPAWN_C__) #if IN_FILE(__G_SPAWN_C__)
#ifndef _WIN64
g_spawn_async PRIVATE g_spawn_async PRIVATE
g_spawn_async_with_pipes PRIVATE g_spawn_async_with_pipes PRIVATE
#endif
g_spawn_close_pid g_spawn_close_pid
#ifndef _WIN64
g_spawn_command_line_async PRIVATE g_spawn_command_line_async PRIVATE
g_spawn_command_line_sync PRIVATE g_spawn_command_line_sync PRIVATE
#endif
g_spawn_error_quark g_spawn_error_quark
#ifndef _WIN64
g_spawn_sync PRIVATE g_spawn_sync PRIVATE
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_spawn_async_utf8 g_spawn_async_utf8
g_spawn_async_with_pipes_utf8 g_spawn_async_with_pipes_utf8
@ -1474,13 +1490,17 @@ g_atexit
g_basename g_basename
#endif #endif
g_get_application_name g_get_application_name
#ifndef _WIN64
g_find_program_in_path PRIVATE g_find_program_in_path PRIVATE
g_get_current_dir PRIVATE g_get_current_dir PRIVATE
g_getenv PRIVATE g_getenv PRIVATE
g_unsetenv PRIVATE g_unsetenv PRIVATE
g_get_home_dir PRIVATE g_get_home_dir PRIVATE
#endif
g_get_host_name g_get_host_name
#ifndef _WIN64
g_setenv PRIVATE g_setenv PRIVATE
#endif
g_listenv g_listenv
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_find_program_in_path_utf8 g_find_program_in_path_utf8
@ -1492,7 +1512,9 @@ g_get_home_dir_utf8
#endif #endif
g_get_language_names g_get_language_names
g_get_prgname g_get_prgname
#ifndef _WIN64
g_get_real_name PRIVATE g_get_real_name PRIVATE
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_get_real_name_utf8 g_get_real_name_utf8
#endif #endif
@ -1501,7 +1523,9 @@ g_get_system_data_dirs
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_win32_get_system_data_dirs_for_module g_win32_get_system_data_dirs_for_module
#endif #endif
#ifndef _WIN64
g_get_tmp_dir PRIVATE g_get_tmp_dir PRIVATE
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_get_tmp_dir_utf8 g_get_tmp_dir_utf8
#endif #endif
@ -1509,7 +1533,9 @@ g_get_user_cache_dir
g_get_user_config_dir g_get_user_config_dir
g_get_user_data_dir g_get_user_data_dir
g_get_user_special_dir g_get_user_special_dir
#ifndef _WIN64
g_get_user_name PRIVATE g_get_user_name PRIVATE
#endif
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_get_user_name_utf8 g_get_user_name_utf8
#endif #endif
@ -1580,9 +1606,13 @@ g_match_info_fetch_all
g_win32_error_message g_win32_error_message
g_win32_ftruncate g_win32_ftruncate
g_win32_get_package_installation_directory_of_module g_win32_get_package_installation_directory_of_module
#ifndef _WIN64
g_win32_get_package_installation_directory PRIVATE g_win32_get_package_installation_directory PRIVATE
#endif
g_win32_get_package_installation_directory_utf8 g_win32_get_package_installation_directory_utf8
#ifndef _WIN64
g_win32_get_package_installation_subdirectory PRIVATE g_win32_get_package_installation_subdirectory PRIVATE
#endif
g_win32_get_package_installation_subdirectory_utf8 g_win32_get_package_installation_subdirectory_utf8
g_win32_get_windows_version g_win32_get_windows_version
g_win32_getlocale g_win32_getlocale

4
glib/gspawn-win32.c
View File

@ -1227,6 +1227,8 @@ g_spawn_close_pid (GPid pid)
CloseHandle (pid); CloseHandle (pid);
} }
#if !defined (_WIN64)
/* Binary compatibility versions that take system codepage pathnames, /* Binary compatibility versions that take system codepage pathnames,
* argument vectors and environments. These get used only by code * 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 * built against 2.8.1 or earlier. Code built against 2.8.2 or later
@ -1492,6 +1494,8 @@ g_spawn_command_line_async (const gchar *command_line,
return retval; return retval;
} }
#endif /* !_WIN64 */
#endif /* !GSPAWN_HELPER */ #endif /* !GSPAWN_HELPER */
#define __G_SPAWN_C__ #define __G_SPAWN_C__

2
glib/gutils.c
View File

@ -3286,7 +3286,7 @@ glib_gettext (const gchar *str)
return g_dgettext (GETTEXT_PACKAGE, str); 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. */ /* Binary compatibility versions. Not for newly compiled code. */

8
glib/gwin32.c
View File

@ -442,6 +442,8 @@ g_win32_get_package_installation_directory (const gchar *package,
return result; return result;
} }
#if !defined (_WIN64)
#undef g_win32_get_package_installation_directory #undef g_win32_get_package_installation_directory
/* DLL ABI binary compatibility version that uses system codepage file names */ /* DLL ABI binary compatibility version that uses system codepage file names */
@ -472,6 +474,8 @@ g_win32_get_package_installation_directory (const gchar *package,
return retval; return retval;
} }
#endif
/** /**
* g_win32_get_package_installation_subdirectory: * g_win32_get_package_installation_subdirectory:
* @package: You should pass %NULL for this. * @package: You should pass %NULL for this.
@ -512,6 +516,8 @@ g_win32_get_package_installation_subdirectory (const gchar *package,
return dirname; return dirname;
} }
#if !defined (_WIN64)
#undef g_win32_get_package_installation_subdirectory #undef g_win32_get_package_installation_subdirectory
/* DLL ABI binary compatibility version that uses system codepage file names */ /* DLL ABI binary compatibility version that uses system codepage file names */
@ -532,6 +538,8 @@ g_win32_get_package_installation_subdirectory (const gchar *package,
return dirname; return dirname;
} }
#endif
static guint windows_version; static guint windows_version;
static void static void

2
glib/makegalias.pl
View File

@ -83,7 +83,7 @@ while (<>) {
next; next;
} }
if ($_ =~ /^\#ifn?def\s+(G|DISABLE_MEM_POOLS)/) if ($_ =~ /^\#ifn?def\s+(G|DISABLE_MEM_POOLS|_WIN64)/)
{ {
print $_; print $_;