widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/compiler_warnings_062017_windows into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017_windows/+merge/326232

Let's see if we can get the AppVeyor builds free of warnings.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/compiler_warnings_062017_windows into lp:widelands.

=== modified file 'src/base/log.h'
--- src/base/log.h	2017-01-25 18:55:59 +0000
+++ src/base/log.h	2017-06-23 16:10:17 +0000
@@ -29,7 +29,7 @@
 #endif
 
 // printf macros for size_t, in the style of inttypes.h
-#ifdef _LP64
+#if defined(_LP64) || defined(_WIN64)
 #define PRIS_PREFIX "z"
 #else
 #define PRIS_PREFIX

=== modified file 'src/game_io/game_player_economies_packet.cc'
--- src/game_io/game_player_economies_packet.cc	2017-01-25 18:55:59 +0000
+++ src/game_io/game_player_economies_packet.cc	2017-06-23 16:10:17 +0000
@@ -78,7 +78,7 @@
 				if (packet_version > 3) {
 					const size_t num_economies = fr.unsigned_16();
 					if (num_economies != economies.size()) {
-						throw GameDataError("Num economies on save (%ld) != Num economies on load (%ld)",
+						throw GameDataError("Num economies on save (%" PRIuS ") != Num economies on load (%" PRIuS ")",
 						                    num_economies, economies.size());
 					}
 				}

=== modified file 'src/logic/map_objects/immovable.cc'
--- src/logic/map_objects/immovable.cc	2017-06-20 08:17:02 +0000
+++ src/logic/map_objects/immovable.cc	2017-06-23 16:10:17 +0000
@@ -1227,7 +1227,7 @@
 */
 PlayerImmovable::~PlayerImmovable() {
 	if (workers_.size())
-		log("PlayerImmovable::~PlayerImmovable: %lu workers left!\n",
+		log("PlayerImmovable::~PlayerImmovable: %" PRIuS " workers left!\n",
 		    static_cast<long unsigned int>(workers_.size()));
 }
 

=== modified file 'src/logic/map_objects/tribes/soldier.cc'
--- src/logic/map_objects/tribes/soldier.cc	2017-06-20 10:35:56 +0000
+++ src/logic/map_objects/tribes/soldier.cc	2017-06-23 16:10:17 +0000
@@ -112,7 +112,7 @@
 	std::vector<std::string> image_filenames =
 	   table->get_table("pictures")->array_entries<std::string>();
 	if (image_filenames.size() != max_level + 1) {
-		throw GameDataError("Soldier needs to have %d pictures for battle attribute, but found %lu",
+		throw GameDataError("Soldier needs to have %u pictures for battle attribute, but found %" PRIuS,
 		                    max_level + 1, image_filenames.size());
 	}
 	for (const std::string& image_filename : image_filenames) {

=== modified file 'src/map_io/map_buildingdata_packet.cc'
--- src/map_io/map_buildingdata_packet.cc	2017-02-12 09:10:57 +0000
+++ src/map_io/map_buildingdata_packet.cc	2017-06-23 16:10:17 +0000
@@ -122,7 +122,7 @@
 									*queue_iter = &mol.get<Worker>(leaver_serial);
 								} catch (const WException& e) {
 									throw GameDataError(
-									   "leave queue item #%lu (%u): %s",
+									   "leave queue item #%li (%u): %s",
 									   static_cast<long int>(queue_iter - leave_queue.begin()),
 									   leaver_serial, e.what());
 								}

=== modified file 'src/wlapplication.h'
--- src/wlapplication.h	2017-01-25 18:55:59 +0000
+++ src/wlapplication.h	2017-06-23 16:10:17 +0000
@@ -23,9 +23,11 @@
 // Workaround for bug http://sourceforge.net/p/mingw/bugs/2152/
 #ifdef __MINGW32__
 #ifndef _WIN64
+#ifndef _USE_32BIT_TIME_T
 #define _USE_32BIT_TIME_T 1
 #endif
 #endif
+#endif
 
 #include <cassert>
 #include <cstring>