projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[oweals/tinc.git]
/
have.h
diff --git
a/have.h
b/have.h
index 89454feba1e92cf46db611f3d3271b42ebb45002..21c16efa8be933233e9c1666521fa3a0b8057e57 100644
(file)
--- a/
have.h
+++ b/
have.h
@@
-21,6
+21,15
@@
#ifndef __TINC_HAVE_H__
#define __TINC_HAVE_H__
#ifndef __TINC_HAVE_H__
#define __TINC_HAVE_H__
+#ifdef HAVE_MINGW
+#ifdef WITH_WINDOWS2000
+#define WINVER Windows2000
+#else
+#define WINVER WindowsXP
+#endif
+#define WIN32_LEAN_AND_MEAN
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@@
-32,12
+41,6
@@
#include <unistd.h>
#ifdef HAVE_MINGW
#include <unistd.h>
#ifdef HAVE_MINGW
-#ifdef WITH_WINDOWS2000
-#define WINVER Windows2000
-#else
-#define WINVER WindowsXP
-#endif
-#define WIN32_LEAN_AND_MEAN
#include <w32api.h>
#include <windows.h>
#include <ws2tcpip.h>
#include <w32api.h>
#include <windows.h>
#include <ws2tcpip.h>