[geany/geany] c5b0fc: Merge pull request #573 from zhekov/cleanup-win32defines

[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:        Wed, 22 Jul 2015 17:59:38 UTC
Commit:      c5b0fc459a1251c824a44edb5dfab4a8feb0bd00
             https://github.com/geany/geany/commit/c5b0fc459a1251c824a44edb5dfab4a8feb0bd00

Log Message:
-----------
Merge pull request #573 from zhekov/cleanup-win32defines

Cleanup win32defines


Modified Paths:
--------------
    src/Makefile.am
    src/socket.c
    src/spawn.c
    src/win32.c
    src/win32defines.h

Modified: src/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -149,7 +149,7 @@ WINDRES = $(host_alias)-windres
 geany_private.res: $(top_srcdir)/geany_private.rc
 	$(WINDRES) -i $(top_srcdir)/geany_private.rc --input-format=rc -o $@ -O coff
 
-libgeany_la_SOURCES += win32.c win32.h win32defines.h
+libgeany_la_SOURCES += win32.c win32.h
 libgeany_la_LIBADD  += -lole32 -lwsock32 -lcomdlg32
 libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined
 geany_LDFLAGS       += -mwindows -mms-bitfields


Modified: src/socket.c
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -57,8 +57,6 @@
 
 #ifdef HAVE_SOCKET
 
-#include "win32defines.h" /* should always come before any system headers */
-
 #include "socket.h"
 
 #include "app.h"


Modified: src/spawn.c
2 lines changed, 0 insertions(+), 2 deletions(-)
===================================================================
@@ -47,8 +47,6 @@
 # include "config.h"
 #endif
 
-#include "win32defines.h" /* should always come before any system headers */
-
 #include <errno.h>
 #include <string.h>
 


Modified: src/win32.c
5 lines changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -27,7 +27,10 @@
 # include "config.h"
 #endif
 
-#include "win32defines.h" /* should always come before any system headers */
+/* Need Windows XP for SHGetFolderPathAndSubDirW */
+#define _WIN32_WINNT 0x0501
+/* Needed for SHGFP_TYPE */
+#define _WIN32_IE 0x0500
 
 #include "win32.h"
 


Modified: src/win32defines.h
32 lines changed, 0 insertions(+), 32 deletions(-)
===================================================================
@@ -1,32 +0,0 @@
-/*
- *      win32defines.h - this file is part of Geany, a fast and lightweight IDE
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License along
- *      with this program; if not, write to the Free Software Foundation, Inc.,
- *      51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef WIN32DEFINES_H
-#define WIN32DEFINES_H 1
-
-/* These defines are necessary defines *before* windows.h is included */
-
-#define VC_EXTRALEAN
-#define WIN32_LEAN_AND_MEAN
-/* Need Windows XP for SHGetFolderPathAndSubDirW */
-#define WINVER 0x0501
-#define _WIN32_WINNT 0x0501
-/* Needed for SHGFP_TYPE */
-#define _WIN32_IE 0x0500
-
-#endif /* WIN32DEFINES_H */



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