summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-11-08 14:52:18 +0300
committerAndrei Karas <akaras@inbox.ru>2013-11-08 14:52:18 +0300
commit5564df0ae67373da8ffb148fde95fdd9142c870b (patch)
tree59ae99399e3392922cacbd8dfd0136a8738ea8a2 /src/utils
parent64535f9763c432bbb46be2769560bfd6a2202d72 (diff)
downloadmv-5564df0ae67373da8ffb148fde95fdd9142c870b.tar.gz
mv-5564df0ae67373da8ffb148fde95fdd9142c870b.tar.bz2
mv-5564df0ae67373da8ffb148fde95fdd9142c870b.tar.xz
mv-5564df0ae67373da8ffb148fde95fdd9142c870b.zip
fix code style.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/files.cpp6
-rw-r--r--src/utils/xml.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index bfaed472a..15b667ba8 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -20,12 +20,12 @@
#include "utils/files.h"
-#include "logger.h"
-
+#if defined(ANDROID) || defined(__native_client__)
#include "resources/resourcemanager.h"
+#include "utils/physfstools.h"
+#endif
#include "utils/mkdir.h"
-#include "utils/physfstools.h"
#include "localconsts.h"
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 60b4505c5..b87418079 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -44,7 +44,7 @@ static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...)
#endif
;
-static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...)
+static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg, ...)
{
unsigned size = 1024;
const unsigned msgSize = strlen(msg);