From 852f2fb99a490157d23f15602e1be939cd7cc9b8 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 10 Jul 2014 00:04:28 +0900 Subject: [PATCH] MinGW: Fix compiler warning about winsock2.h and windows.h This commit fixes following compiler warning with mingw compiler: In file included from common.h:63:0, from util_security.h:42, from util_security.cc:36: /usr/share/mingw-w64/include/winsock2.h:15:2: warning: #warning Please include winsock2.h before windows.h [-Wcpp] #warning Please include winsock2.h before windows.h --- README.rst | 2 ++ src/util_security.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index cdf4f6d5..56eac826 100644 --- a/README.rst +++ b/README.rst @@ -361,6 +361,8 @@ environment variable which must fulfill the following conditions: $NDK/build/tools/make-standalone-toolchain.sh --platform=android-18 --toolchain=arm-linux-androideabi-4.8 --install-dir=$ANDROID_HOME/toolchain + $NDK/build/tools/make-standalone-toolchain.sh --install-dir=$ANDROID_HOME/toolchain --toolchain=arm-linux-androideabi-4.8 --llvm-version=3.4 + You may need to add ``--system=linux-x86_64`` to the above command-line for x86_64 Linux host. diff --git a/src/util_security.h b/src/util_security.h index 4794d67e..8c95db60 100644 --- a/src/util_security.h +++ b/src/util_security.h @@ -36,10 +36,11 @@ #ifndef D_UTIL_SECURITY_H #define D_UTIL_SECURITY_H +#include "common.h" + #include #include -#include "common.h" #include "a2functional.h" #include "MessageDigest.h"