From 99f14bbd62706f7624316e23dfd9015e6545add5 Mon Sep 17 00:00:00 2001 From: spartanj Date: Mon, 23 Aug 2010 15:01:02 -0300 Subject: [PATCH] Fixed Windows compilation. --- ee.win.cbp | 239 ++++++++++++++++++++++++++++++++++++- src/helper/libzip/config.h | 19 +-- 2 files changed, 245 insertions(+), 13 deletions(-) diff --git a/ee.win.cbp b/ee.win.cbp index c0577e81f..2130c7b63 100644 --- a/ee.win.cbp +++ b/ee.win.cbp @@ -34,10 +34,13 @@ + + + + - @@ -119,13 +122,22 @@ + + + + + + + + + @@ -166,14 +178,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/helper/libzip/config.h b/src/helper/libzip/config.h index 4eeaed823..329dc037a 100644 --- a/src/helper/libzip/config.h +++ b/src/helper/libzip/config.h @@ -7,12 +7,21 @@ /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 - + +#if !defined( __WIN32__ ) && !defined( _WIN32 ) /* Define to 1 if you have the `fseeko' function. */ #define HAVE_FSEEKO 1 /* Define to 1 if you have the `ftello' function. */ -#define HAVE_FTELLO 1 +#define HAVE_FTELLO 1 + +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ +#define HAVE_STRUCT_TM_TM_ZONE 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +#endif /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 @@ -23,9 +32,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the `mkstemp' function. */ -#define HAVE_MKSTEMP 1 - /* Define to 1 if you have the `MoveFileExA' function. */ /* #undef HAVE_MOVEFILEEXA */ @@ -41,9 +47,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if `tm_zone' is a member of `struct tm'. */ -#define HAVE_STRUCT_TM_TM_ZONE 1 - /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1