[glib] win32: visibility fixups
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] win32: visibility fixups
- Date: Mon, 14 Jan 2013 04:00:24 +0000 (UTC)
commit f13d3c075fce46a361ea98fb0c487aa21d4d1673
Author: Ryan Lortie <desrt desrt ca>
Date: Sun Jan 13 15:34:27 2013 -0500
win32: visibility fixups
Add/remove visibility macros according to if symbols were previously
part of our public win32 API.
glib/glib-private.h | 2 ++
glib/gunicode.h | 2 --
glib/gwin32.h | 14 +++++++++++---
3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/glib/glib-private.h b/glib/glib-private.h
index 39b4b77..7675f4d 100644
--- a/glib/glib-private.h
+++ b/glib/glib-private.h
@@ -31,7 +31,9 @@ G_GNUC_INTERNAL
GMainContext * g_main_context_new_with_next_id (guint next_id);
#ifdef G_OS_WIN32
+GLIB_AVAILABLE_IN_ALL
gchar *_glib_get_dll_directory (void);
+GLIB_AVAILABLE_IN_ALL
gchar *_glib_get_locale_dir (void);
#endif
diff --git a/glib/gunicode.h b/glib/gunicode.h
index a05e70e..d51fa43 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -806,8 +806,6 @@ gchar *g_utf8_collate_key_for_filename (const gchar *str,
/* private */
-
-GLIB_AVAILABLE_IN_ALL
gchar *_g_utf8_make_valid (const gchar *name);
G_END_DECLS
diff --git a/glib/gwin32.h b/glib/gwin32.h
index 7f1b2bf..ae87a45 100644
--- a/glib/gwin32.h
+++ b/glib/gwin32.h
@@ -65,6 +65,7 @@ G_BEGIN_DECLS
* g_win32_. Or that was the idea at some time, but there is just one
* of those:
*/
+GLIB_AVAILABLE_IN_ALL
gint g_win32_ftruncate (gint f,
guint size);
#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
* names etc. The returned string should be deallocated with g_free().
*/
+GLIB_AVAILABLE_IN_ALL
gchar* g_win32_getlocale (void);
/* Translate a Win32 error code (as returned by GetLastError()) into
* the corresponding message. The returned string should be deallocated
* with g_free().
*/
+GLIB_AVAILABLE_IN_ALL
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,
const gchar *dll_name);
+GLIB_DEPRECATED
gchar* g_win32_get_package_installation_subdirectory (const gchar *package,
const gchar *dll_name,
const gchar *subdir);
-
#endif
+GLIB_AVAILABLE_IN_ALL
gchar* g_win32_get_package_installation_directory_of_module (gpointer hmodule);
+GLIB_AVAILABLE_IN_ALL
guint g_win32_get_windows_version (void);
+GLIB_AVAILABLE_IN_ALL
gchar* g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
/* 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
#endif
+GLIB_AVAILABLE_IN_ALL
gchar *g_win32_get_package_installation_directory_utf8 (const gchar *package,
const gchar *dll_name);
+GLIB_AVAILABLE_IN_ALL
gchar *g_win32_get_package_installation_subdirectory_utf8 (const gchar *package,
const gchar *dll_name,
const gchar *subdir);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]