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

Fixed compile error with i686-w64-mingw32

pull/16/merge
Tatsuhiro Tsujikawa 2012-04-07 21:26:33 +09:00
parent 840ca5adb6
commit fcb102b650
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/array_fun.h
View File

@ -35,6 +35,8 @@
#ifndef D_ARRAY_FUN_H #ifndef D_ARRAY_FUN_H
#define D_ARRAY_FUN_H #define D_ARRAY_FUN_H
#include "common.h"
#include <cstdlib> #include <cstdlib>
#include <functional> #include <functional>

11
src/common.h
View File

@ -35,17 +35,6 @@
#ifndef D_COMMON_H #ifndef D_COMMON_H
#define D_COMMON_H #define D_COMMON_H
#ifdef __MINGW32__
# undef SIZE_MAX
# ifndef _OFF_T_
# define _OFF_T_
typedef long long _off_t;
# ifndef _NO_OLDNAMES
typedef _off_t off_t;
# endif // !_NO_OLDNAMES
# endif // !_OFF_T_
#endif // __MINGW32__
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif

10
src/util.cc
View File

@ -1083,14 +1083,14 @@ std::string abbrevSize(int64_t size)
} }
void sleep(long seconds) { void sleep(long seconds) {
#ifdef HAVE_SLEEP #if defined(HAVE_WINSOCK2_H)
::Sleep(seconds * 1000);
#elif HAVE_SLEEP
::sleep(seconds); ::sleep(seconds);
#elif defined(HAVE_USLEEP) #elif defined(HAVE_USLEEP)
::usleep(seconds * 1000000); ::usleep(seconds * 1000000);
#elif defined(HAVE_WINSOCK2_H)
::Sleep(seconds * 1000);
#else #else
#error no sleep function is available (nanosleep?) # error no sleep function is available (nanosleep?)
#endif #endif
} }
@ -1556,7 +1556,7 @@ void executeHook
NULL, NULL,
NULL, NULL,
true, true,
NULL, 0,
NULL, NULL,
0, 0,
&si, &si,