summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-29 22:53:04 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-29 22:53:04 +0300
commit6ba55bd63422372bf4b9a573f0c75fc0877652c1 (patch)
treebeb3285c71b052bea0fdad93acd2461e4fc5df49
parent8f95378c3be89c06c722da03ddbd3641c4fc2323 (diff)
downloadmv-6ba55bd63422372bf4b9a573f0c75fc0877652c1.tar.gz
mv-6ba55bd63422372bf4b9a573f0c75fc0877652c1.tar.bz2
mv-6ba55bd63422372bf4b9a573f0c75fc0877652c1.tar.xz
mv-6ba55bd63422372bf4b9a573f0c75fc0877652c1.zip
Move rwops types into separate file.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/fs/virtfs/rwopstypes.h34
-rw-r--r--src/fs/virtfs/virtfsrwops.h10
4 files changed, 39 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3a59a23b0..85ae478d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -891,6 +891,7 @@ SET(SRCS
fs/virtfs/virtlist.h
fs/virtfs/virtfs.cpp
fs/virtfs/virtfs.h
+ fs/virtfs/rwopstypes.h
fs/virtfs/virtdirentry.cpp
fs/virtfs/virtdirentry.h
fs/virtfs/virtfsdir.cpp
@@ -1790,6 +1791,7 @@ SET(DYE_CMD_SRCS
fs/virtfs/virtlist.h
fs/virtfs/virtfs.cpp
fs/virtfs/virtfs.h
+ fs/virtfs/rwopstypes.h
fs/virtfs/virtdirentry.cpp
fs/virtfs/virtdirentry.h
fs/virtfs/virtfsdir.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 0c6f7f7a9..c6b35a6df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -836,6 +836,7 @@ BASE_SRC += events/actionevent.h \
winver.h \
enums/fs/fsentrytype.h \
fs/virtfs/fileapi.h \
+ fs/virtfs/rwopstypes.h \
fs/virtfs/virtdirentry.cpp \
fs/virtfs/virtdirentry.h \
fs/virtfs/virtfs.cpp \
diff --git a/src/fs/virtfs/rwopstypes.h b/src/fs/virtfs/rwopstypes.h
new file mode 100644
index 000000000..36a87e5a4
--- /dev/null
+++ b/src/fs/virtfs/rwopstypes.h
@@ -0,0 +1,34 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2013-2017 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SRC_FS_VIRTFS_RWOPSTYPES_H
+#define SRC_FS_VIRTFS_RWOPSTYPES_H
+
+#include "localconsts.h"
+
+#ifdef USE_SDL2
+#define RWOPSINT int64_t
+#define RWOPSSIZE size_t
+#else // USE_SDL2
+#define RWOPSINT int32_t
+#define RWOPSSIZE int
+#endif // USE_SDL2
+
+#endif // SRC_FS_VIRTFS_RWOPSTYPES_H
diff --git a/src/fs/virtfs/virtfsrwops.h b/src/fs/virtfs/virtfsrwops.h
index 46d5acca0..ea1259d17 100644
--- a/src/fs/virtfs/virtfsrwops.h
+++ b/src/fs/virtfs/virtfsrwops.h
@@ -47,17 +47,11 @@
#include "localconsts.h"
+#include "fs/virtfs/rwopstypes.h"
+
#include <string>
#include <SDL_rwops.h>
-#ifdef USE_SDL2
-#define RWOPSINT int64_t
-#define RWOPSSIZE size_t
-#else // USE_SDL2
-#define RWOPSINT int32_t
-#define RWOPSSIZE int
-#endif // USE_SDL2
-
struct VirtFile;
namespace VirtFs