HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include win32defines.h before win32.h to fix build errors

Browse Source
This commit is contained in:
Enrico Tröger 2015-07-12 16:46:08 +02:00
parent f11a2eb013
commit e5471fb5ce
4 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/socket.c
View File

@ -57,6 +57,8 @@
#ifdef HAVE_SOCKET #ifdef HAVE_SOCKET
#include "win32defines.h" /* should always come before any system headers */
#include "socket.h" #include "socket.h"
#include "app.h" #include "app.h"
@ -79,7 +81,6 @@
# include <netinet/in.h> # include <netinet/in.h>
# include <glib/gstdio.h> # include <glib/gstdio.h>
#else #else
# include "win32defines.h"
# include <winsock2.h> # include <winsock2.h>
# include <windows.h> # include <windows.h>
# include <gdk/gdkwin32.h> # include <gdk/gdkwin32.h>

3
src/spawn.c
View File

@ -43,13 +43,14 @@
# include "config.h" # include "config.h"
#endif #endif
#include "win32defines.h" /* should always come before any system headers */
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "spawn.h" #include "spawn.h"
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
# include "win32defines.h"
# include <ctype.h> /* isspace() */ # include <ctype.h> /* isspace() */
# include <fcntl.h> /* _O_RDONLY, _O_WRONLY */ # include <fcntl.h> /* _O_RDONLY, _O_WRONLY */
# include <io.h> /* _open_osfhandle, _close */ # include <io.h> /* _open_osfhandle, _close */

4
src/win32.c
View File

@ -27,12 +27,12 @@
# include "config.h" # include "config.h"
#endif #endif
#include "win32defines.h" /* should always come before any system headers */
#include "win32.h" #include "win32.h"
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include "win32defines.h"
#include "dialogs.h" #include "dialogs.h"
#include "document.h" #include "document.h"
#include "editor.h" #include "editor.h"

1
src/win32defines.h
View File

@ -25,6 +25,7 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
/* Need Windows XP for SHGetFolderPathAndSubDirW */ /* Need Windows XP for SHGetFolderPathAndSubDirW */
#define WINVER 0x0501 #define WINVER 0x0501
#define _WIN32_WINNT 0x0501
/* Needed for SHGFP_TYPE */ /* Needed for SHGFP_TYPE */
#define _WIN32_IE 0x0500 #define _WIN32_IE 0x0500