diff --git a/cmake b/cmake index 51114339b..ddd0136d4 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 51114339b929a662fb85d45ab6310b0423ac4cef +Subproject commit ddd0136d4e99b0daab16361aad5338ad3ca4b808 diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt index a31116ddd..9f9fc2152 100755 --- a/core/src/CMakeLists.txt +++ b/core/src/CMakeLists.txt @@ -169,7 +169,6 @@ set (LIB_SRC util/log.c util/message.c util/nrmessage.c - util/os.c util/parser.c util/rand.c util/resolve.c diff --git a/core/src/kernel/battle.c b/core/src/kernel/battle.c index a380c5d78..b38443fd6 100644 --- a/core/src/kernel/battle.c +++ b/core/src/kernel/battle.c @@ -59,7 +59,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include #include #include #include diff --git a/core/src/kernel/reports.c b/core/src/kernel/reports.c index 86d0489ec..4b20ccbf3 100644 --- a/core/src/kernel/reports.c +++ b/core/src/kernel/reports.c @@ -52,7 +52,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include #include /* libc includes */ diff --git a/core/src/kernel/save.c b/core/src/kernel/save.c index d3d0ddba6..8e2a1fb2c 100644 --- a/core/src/kernel/save.c +++ b/core/src/kernel/save.c @@ -61,7 +61,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include #include -#include #include #include #include diff --git a/core/src/util/os.c b/core/src/util/os.c deleted file mode 100644 index 5a7220e7d..000000000 --- a/core/src/util/os.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "os.h" - -#if defined(WIN32) -#include -#else /* WIN32 */ -#include -#include -#endif /* WIN32 */ -int os_mkdir(const char *path, int mode) -{ - -#ifdef WIN32 - mode = mode; - return _mkdir(path); -#else /* POSIX is our last hope */ - return mkdir(path, (mode_t) mode); -#endif /* WIN32 */ -} diff --git a/core/src/util/os.h b/core/src/util/os.h deleted file mode 100644 index cf4bb06ea..000000000 --- a/core/src/util/os.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright (c) 1998-2010, Enno Rehling - Katja Zedel - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -**/ - -#ifndef _OS_H -#define _OS_H -#ifdef __cplusplus -extern "C" { -#endif - - extern int os_mkdir(const char *path, int mode); -#ifdef __cplusplus -} -#endif -#endif