From ca08818bbff9d5bbefaba5971dc81bbea128dfa2 Mon Sep 17 00:00:00 2001 From: Pixel Date: Wed, 12 Oct 2011 10:04:26 -0700 Subject: Mingw32 is braindead, and doesn't support _FILE_OFFSET_BITS. Disabling the stat watcher in libev, and adding a patch for people to fix their mingw32 distribution. --- mingw32-config.h | 2 ++ patches/mingwrt_file64.diff | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 patches/mingwrt_file64.diff diff --git a/mingw32-config.h b/mingw32-config.h index bc6f2ab..d5f419b 100644 --- a/mingw32-config.h +++ b/mingw32-config.h @@ -31,3 +31,5 @@ #define HAVE_UNISTD_H 1 #define HAVE_FLOOR 1 + +#define EV_STAT_ENABLE 0 diff --git a/patches/mingwrt_file64.diff b/patches/mingwrt_file64.diff new file mode 100644 index 0000000..0bb5f87 --- /dev/null +++ b/patches/mingwrt_file64.diff @@ -0,0 +1,46 @@ +diff -ur mingwrt-3.18-mingw32.orig/include/io.h mingwrt-3.18-mingw32/include/io.h +--- mingwrt-3.18-mingw32.orig/include/io.h 2010-03-07 04:28:36 +0100 ++++ mingwrt-3.18-mingw32/include/io.h 2010-03-22 02:09:26 +0100 +@@ -484,6 +484,10 @@ + + #endif /* Not _NO_OLDNAMES */ + ++#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64 ++#define lseek _lseeki64 ++#endif ++ + #ifdef __cplusplus + } + #endif +diff -ur mingwrt-3.18-mingw32.orig/include/sys/stat.h mingwrt-3.18-mingw32/include/sys/stat.h +--- mingwrt-3.18-mingw32.orig/include/sys/stat.h 2010-03-07 04:28:37 +0100 ++++ mingwrt-3.18-mingw32/include/sys/stat.h 2010-03-22 02:09:26 +0100 +@@ -270,6 +270,13 @@ + #endif /* _WSTAT_DEFIND */ + #endif /* __MSVCRT__ */ + ++#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64 ++#undef stat ++#define stat _stati64 ++#define fstat _fstati64 ++#define wstat _wstati64 ++#endif ++ + #ifdef __cplusplus + } + #endif +diff -ur mingwrt-3.18-mingw32.orig/include/sys/types.h mingwrt-3.18-mingw32/include/sys/types.h +--- mingwrt-3.18-mingw32.orig/include/sys/types.h 2010-03-07 04:28:37 +0100 ++++ mingwrt-3.18-mingw32/include/sys/types.h 2010-03-22 02:09:26 +0100 +@@ -49,7 +49,11 @@ + + #ifndef _OFF_T_ + #define _OFF_T_ ++#if defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64 ++typedef long long _off_t; ++#else + typedef long _off_t; ++#endif + + #ifndef _NO_OLDNAMES + typedef _off_t off_t; -- cgit v1.2.3