Merge lp:~zorba-coders/zorba/archive_windows_fix into lp:zorba/archive-module

[Juan Zacarias]

Changes for Windows Compilation

Changes for Windows Compilation

[Juan Zacarias (juan457)]

review: Approve

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/archive_module.xq.src/archive_module.cpp'
--- src/archive_module.xq.src/archive_module.cpp	2013-09-16 18:45:03 +0000
+++ src/archive_module.xq.src/archive_module.cpp	2013-10-22 21:40:37 +0000
@@ -30,6 +30,7 @@
 #ifdef WIN32
 # include "strptime.h"
 #ifndef _WIN64
+# include <Windows.h>
 # include <MMSystem.h>
 #endif
 #endif
@@ -168,7 +169,7 @@
     }
   }
 
-  zorba::Item&
+  zorba::Item
   ArchiveModule::getGlobalItems(enum ArchiveModule::GLOBAL_ITEMS g)
   {
       switch(g)

=== modified file 'src/archive_module.xq.src/archive_module.h'
--- src/archive_module.xq.src/archive_module.h	2013-08-06 22:13:42 +0000
+++ src/archive_module.xq.src/archive_module.h	2013-10-22 21:40:37 +0000
@@ -107,7 +107,7 @@
       static void
       parseDateTimeItem(const zorba::Item& i, time_t&);
 
-      static zorba::Item& getGlobalItems(enum GLOBAL_ITEMS g);
+      static zorba::Item getGlobalItems(enum GLOBAL_ITEMS g);
   };