win32: visibility fixups

Add/remove visibility macros according to if symbols were previously
part of our public win32 API.
This commit is contained in:
Ryan Lortie 2013-01-13 15:34:27 -05:00
parent 38359d1796
commit f13d3c075f
3 changed files with 13 additions and 5 deletions

View File

@ -31,7 +31,9 @@ G_GNUC_INTERNAL
GMainContext * g_main_context_new_with_next_id (guint next_id); GMainContext * g_main_context_new_with_next_id (guint next_id);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
GLIB_AVAILABLE_IN_ALL
gchar *_glib_get_dll_directory (void); gchar *_glib_get_dll_directory (void);
GLIB_AVAILABLE_IN_ALL
gchar *_glib_get_locale_dir (void); gchar *_glib_get_locale_dir (void);
#endif #endif

View File

@ -806,8 +806,6 @@ gchar *g_utf8_collate_key_for_filename (const gchar *str,
/* private */ /* private */
GLIB_AVAILABLE_IN_ALL
gchar *_g_utf8_make_valid (const gchar *name); gchar *_g_utf8_make_valid (const gchar *name);
G_END_DECLS G_END_DECLS

View File

@ -65,6 +65,7 @@ G_BEGIN_DECLS
* g_win32_. Or that was the idea at some time, but there is just one * g_win32_. Or that was the idea at some time, but there is just one
* of those: * of those:
*/ */
GLIB_AVAILABLE_IN_ALL
gint g_win32_ftruncate (gint f, gint g_win32_ftruncate (gint f,
guint size); guint size);
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
@ -75,29 +76,34 @@ gint g_win32_ftruncate (gint f,
* returns it as a string of the above form for use in forming file * returns it as a string of the above form for use in forming file
* names etc. The returned string should be deallocated with g_free(). * names etc. The returned string should be deallocated with g_free().
*/ */
GLIB_AVAILABLE_IN_ALL
gchar* g_win32_getlocale (void); gchar* g_win32_getlocale (void);
/* Translate a Win32 error code (as returned by GetLastError()) into /* Translate a Win32 error code (as returned by GetLastError()) into
* the corresponding message. The returned string should be deallocated * the corresponding message. The returned string should be deallocated
* with g_free(). * with g_free().
*/ */
GLIB_AVAILABLE_IN_ALL
gchar* g_win32_error_message (gint error); gchar* g_win32_error_message (gint error);
#ifndef G_DISABLE_DEPRECATED #ifndef _WIN64
GLIB_DEPRECATED
gchar* g_win32_get_package_installation_directory (const gchar *package, gchar* g_win32_get_package_installation_directory (const gchar *package,
const gchar *dll_name); const gchar *dll_name);
GLIB_DEPRECATED
gchar* g_win32_get_package_installation_subdirectory (const gchar *package, gchar* g_win32_get_package_installation_subdirectory (const gchar *package,
const gchar *dll_name, const gchar *dll_name,
const gchar *subdir); const gchar *subdir);
#endif #endif
GLIB_AVAILABLE_IN_ALL
gchar* g_win32_get_package_installation_directory_of_module (gpointer hmodule); gchar* g_win32_get_package_installation_directory_of_module (gpointer hmodule);
GLIB_AVAILABLE_IN_ALL
guint g_win32_get_windows_version (void); guint g_win32_get_windows_version (void);
GLIB_AVAILABLE_IN_ALL
gchar* g_win32_locale_filename_from_utf8 (const gchar *utf8filename); gchar* g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
/* As of GLib 2.14 we only support NT-based Windows */ /* As of GLib 2.14 we only support NT-based Windows */
@ -114,8 +120,10 @@ G_END_DECLS
#define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8 #define g_win32_get_package_installation_subdirectory g_win32_get_package_installation_subdirectory_utf8
#endif #endif
GLIB_AVAILABLE_IN_ALL
gchar *g_win32_get_package_installation_directory_utf8 (const gchar *package, gchar *g_win32_get_package_installation_directory_utf8 (const gchar *package,
const gchar *dll_name); const gchar *dll_name);
GLIB_AVAILABLE_IN_ALL
gchar *g_win32_get_package_installation_subdirectory_utf8 (const gchar *package, gchar *g_win32_get_package_installation_subdirectory_utf8 (const gchar *package,
const gchar *dll_name, const gchar *dll_name,
const gchar *subdir); const gchar *subdir);