[geany/geany] 34de4b: Merge pull request #276 from codebrainz/win32-includes

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sat, 24 May 2014 11:15:39 UTC
Commit:      34de4b655ee967506b5c3eae657bebbc3e6e67de
             https://github.com/geany/geany/commit/34de4b655ee967506b5c3eae657bebbc3e6e67de

Log Message:
-----------
Merge pull request #276 from codebrainz/win32-includes

Re-order win32.[ch] includes a little bit to unbreak build


Modified Paths:
--------------
    src/win32.c
    src/win32.h

Modified: src/win32.c
3 lines changed, 1 insertions(+), 2 deletions(-)
===================================================================
@@ -23,6 +23,7 @@
  * Special functions for the win32 platform, to provide native dialogs.
  */
 
+#include "win32.h"
 
 #ifdef G_OS_WIN32
 
@@ -45,8 +46,6 @@
 #include <glib/gstdio.h>
 #include <gdk/gdkwin32.h>
 
-#include "win32.h"
-
 #include "document.h"
 #include "support.h"
 #include "utils.h"


Modified: src/win32.h
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -22,10 +22,13 @@
 #ifndef GEANY_WIN32_H
 #define GEANY_WIN32_H 1
 
-#ifdef G_OS_WIN32
+#include "document.h"
 
 #include "gtkcompat.h"
 
+
+#ifdef G_OS_WIN32
+
 G_BEGIN_DECLS
 
 void win32_show_pref_file_dialog(GtkEntry *item);



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).