summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-10-23 20:07:06 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-05 21:11:23 +0100
commitfc4892ab6cc4e61ced26ab3789bb3b69bab11e76 (patch)
tree4fe766cb4a37c5b3fee117d8ea92f9b4ba5ec698
parenta6d6f0085784d83628cd341b606d3f8562111269 (diff)
downloadmana-fc4892ab6cc4e61ced26ab3789bb3b69bab11e76.tar.gz
mana-fc4892ab6cc4e61ced26ab3789bb3b69bab11e76.tar.bz2
mana-fc4892ab6cc4e61ced26ab3789bb3b69bab11e76.tar.xz
mana-fc4892ab6cc4e61ced26ab3789bb3b69bab11e76.zip
Added missing header and print newline at end of usage instructions
(cherry picked from commit afa57ceea0df1ce1ca494d7794e2f6542befc214)
-rw-r--r--tools/tmxcopy/main.cpp2
-rw-r--r--tools/tmxcopy/map.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/tmxcopy/main.cpp b/tools/tmxcopy/main.cpp
index 92a69c54..f50c0af4 100644
--- a/tools/tmxcopy/main.cpp
+++ b/tools/tmxcopy/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char * argv[] )
// parsing command line options
if (argc < 9 || argc > 10)
{
- std::cerr<<"Usage: srcFile x y width height tgtFile x y [outfile]";
+ std::cerr<<"Usage: srcFile x y width height tgtFile x y [outfile]\n";
return -1;
}
diff --git a/tools/tmxcopy/map.cpp b/tools/tmxcopy/map.cpp
index b554aac2..82fe0f8f 100644
--- a/tools/tmxcopy/map.cpp
+++ b/tools/tmxcopy/map.cpp
@@ -23,6 +23,7 @@
#include <map>
#include <list>
+#include <string.h>
#include <zlib.h>
#include "xmlutils.h"