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

2013-10-22 Thread Juan Zacarias 
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/archive_windows_fix 
into lp:zorba/archive-module.

Commit message:
Changes for Windows Compilation

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251

Changes for Windows Compilation
-- 
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251
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-09-16 18:45:03 +
+++ src/archive_module.xq.src/archive_module.cpp	2013-10-22 21:40:37 +
@@ -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 +
+++ src/archive_module.xq.src/archive_module.h	2013-10-22 21:40:37 +
@@ -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);
   };
 
 

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive_windows_fix into lp:zorba/archive-module

2013-10-22 Thread Juan Zacarias 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/archive_windows_fix into lp:zorba/archive-module

2013-10-22 Thread Chris Hillery 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

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

2013-10-22 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/archive_windows_fix into 
lp:zorba/archive-module has been updated.

Status: Needs review = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251
-- 
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

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

2013-10-22 Thread Zorba Build Bot 
Validation queue succeeded - proposal merged!
-- 
https://code.launchpad.net/~zorba-coders/zorba/archive_windows_fix/+merge/192251
Your team Zorba Coders is subscribed to branch lp:zorba/archive-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp