zorba-coders team mailing list archive

[Juan Zacarias <juan457@xxxxxxxxx>]

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/archive-module-win64 into lp:zorba/archive-module.

Commit message:
Fixes for Windows64

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845

Fixes for Windows64
-- 
https://code.launchpad.net/~zorba-coders/zorba/archive-module-win64/+merge/178845
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.

=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp	2013-07-31 22:00:40 +0000
+++ src/archive_module.xq.src/archive_module.cpp	2013-08-06 20:42:32 +0000
@@ -27,9 +27,11 @@
 # include <sys/time.h>
 #endif
 #ifdef WIN32
-# include <strptime.h>
+# include "strptime.h"
+#ifndef _WIN64
 # include <MMSystem.h>
 #endif
+#endif
 
 #include <zorba/diagnostic_list.h>
 #include <zorba/empty_sequence.h>
@@ -890,11 +892,8 @@
     ArchiveFunction::checkForError(lErr, 0, a);
   }
 
-#ifdef WIN32
-  long
-#else
-  ssize_t
-#endif    
+
+  _ssize_t 
   ArchiveItemSequence::readStream(struct archive*, void *data, const void **buff)
   {
     ArchiveItemSequence::CallbackData* lData =
@@ -987,11 +986,8 @@
     theArchive = 0;
   }
 
-#ifdef WIN32
-  long
-#else
-  ssize_t
-#endif
+
+  _ssize_t
   ArchiveFunction::writeStream(
       struct archive *,
       void *func,

=== modified file 'src/archive_module.xq.src/archive_module.h'
--- src/archive_module.xq.src/archive_module.h	2013-07-29 19:24:56 +0000
+++ src/archive_module.xq.src/archive_module.h	2013-08-06 20:42:32 +0000
@@ -32,9 +32,16 @@
 #define ZORBA_ARCHIVE_COMPRESSION_DEFLATE 50
 #define ZORBA_ARCHIVE_COMPRESSION_STORE   51
 
-
 namespace zorba { namespace archive {
 
+#ifdef _WIN64
+  typedef long long _ssize_t;
+#elif WIN32
+  typedef long _ssize_t;
+#else
+  typedef ssize_t _ssize_t;
+#endif
+
 /*******************************************************************************
  ******************************************************************************/
   class ArchiveModule : public ExternalModule {
@@ -165,11 +172,8 @@
       virtual ~ArchiveItemSequence() {}
 
     protected:
-#ifdef WIN32
-      static long
-#else
-      static ssize_t
-#endif    
+
+      static _ssize_t  
       readStream(struct archive *a, void *client_data, const void **buff);
 
       // needed for the "non-linear" zip format
@@ -323,11 +327,8 @@
       static zorba::Item
       getOneItem(const Arguments_t& aArgs, int aIndex);
 
-#ifdef WIN32
-      static long
-#else
-      static ssize_t
-#endif    
+
+      static _ssize_t  
       writeStream(struct archive *a, void *client_data, const void *buff, size_t n);
 
       static int