github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

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
pull/251/head
Tatsuhiro Tsujikawa 2014-07-10 00:04:28 +09:00
parent e55b543b64
commit 852f2fb99a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -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 --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 You may need to add ``--system=linux-x86_64`` to the above
command-line for x86_64 Linux host. command-line for x86_64 Linux host.

3
src/util_security.h
View File

@ -36,10 +36,11 @@
#ifndef D_UTIL_SECURITY_H #ifndef D_UTIL_SECURITY_H
#define D_UTIL_SECURITY_H #define D_UTIL_SECURITY_H
#include "common.h"
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include "common.h"
#include "a2functional.h" #include "a2functional.h"
#include "MessageDigest.h" #include "MessageDigest.h"