[glib/wip/xclaesse/doc-part1: 4/5] Win32: Move g_win32_check_windows_version() to the correct place in header



commit e8f1c7dac358f110a9486525b39b612ed03536aa
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Wed Jan 28 12:25:10 2015 -0500

    Win32: Move g_win32_check_windows_version() to the correct place in header
    
    It was added after G_END_DECLS, outside the #ifdef G_PLATFORM_WIN32,
    and inside a #ifndef __GTK_DOC_IGNORE__ block. So it was missing from
    the doc.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=743661

 glib/gwin32.h |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/glib/gwin32.h b/glib/gwin32.h
index f6e457d..1ec407d 100644
--- a/glib/gwin32.h
+++ b/glib/gwin32.h
@@ -111,25 +111,6 @@ gchar **        g_win32_get_command_line (void);
 #define G_WIN32_IS_NT_BASED() TRUE
 #define G_WIN32_HAVE_WIDECHAR_API() TRUE
 
-G_END_DECLS
-
-#endif  /* G_PLATFORM_WIN32 */
-
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#ifdef _WIN64
-#define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8
-#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);
-
 /**
  * GWin32OSType:
  * @G_WIN32_OS_ANY: The running system can be a workstation or a server edition of
@@ -154,6 +135,25 @@ gboolean g_win32_check_windows_version (const gint major,
                                         const gint spver,
                                         const GWin32OSType os_type);
 
+G_END_DECLS
+
+#endif  /* G_PLATFORM_WIN32 */
+
+#ifndef __GTK_DOC_IGNORE__
+#ifdef G_OS_WIN32
+#ifdef _WIN64
+#define g_win32_get_package_installation_directory g_win32_get_package_installation_directory_utf8
+#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);
+
 #endif /* G_OS_WIN32 */
 #endif /* __GTK_DOC_IGNORE__ */
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]