Win32: Move g_win32_check_windows_version() to the correct place in header
authorXavier Claessens <xavier.claessens@collabora.com>
Wed, 28 Jan 2015 17:25:10 +0000 (12:25 -0500)
committerRyan Lortie <desrt@desrt.ca>
Thu, 12 Mar 2015 20:09:14 +0000 (16:09 -0400)
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

index f6e457d..ff4a9ca 100644 (file)
@@ -111,10 +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
@@ -129,6 +125,8 @@ 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__ */
 
 /**
  * GWin32OSType:
@@ -154,7 +152,8 @@ gboolean g_win32_check_windows_version (const gint major,
                                         const gint spver,
                                         const GWin32OSType os_type);
 
-#endif /* G_OS_WIN32 */
-#endif /* __GTK_DOC_IGNORE__ */
+G_END_DECLS
+
+#endif  /* G_PLATFORM_WIN32 */
 
 #endif /* __G_WIN32_H__ */