- Removed outdated version number handling (follow-up to r11503).

- Fixed mapcache compilation issues in Linux.
- Added some missing `svn:ignore` properties.
- Moved `BLOCK_SIZE` definition from header to source file.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15586 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 7 insertions, 34 deletions

diff --git a/src/common/Makefile.in b/src/common/Makefile.in
index 7897b6cfb..de591a59f 100644
--- a/src/common/Makefile.in
+++ b/src/common/Makefile.in
@@ -4,7 +4,7 @@ COMMON_OBJ = obj_all/core.o obj_all/socket.o obj_all/timer.o obj_all/db.o obj_al
 	obj_all/grfio.o obj_all/mapindex.o obj_all/ers.o obj_all/md5calc.o \
 	obj_all/minicore.o obj_all/minisocket.o obj_all/minimalloc.o obj_all/random.o obj_all/des.o \
 	obj_all/conf.o
-COMMON_H = mmo.h plugin.h version.h \
+COMMON_H = mmo.h plugin.h \
 	core.h socket.h timer.h db.h plugins.h lock.h \
 	nullpo.h malloc.h showmsg.h  strlib.h utils.h \
 	grfio.h mapindex.h ers.h md5calc.h random.h des.h \
diff --git a/src/common/core.c b/src/common/core.c
index 60ba5d6cd..89a002ebe 100644
--- a/src/common/core.c
+++ b/src/common/core.c
@@ -2,7 +2,6 @@
 // For more information, see LICENCE in the main folder
 
 #include "../common/mmo.h"
-#include "../common/version.h"
 #include "../common/showmsg.h"
 #include "../common/malloc.h"
 #include "core.h"
diff --git a/src/common/core.h b/src/common/core.h
index ecaa2a9d0..11b4f7c47 100644
--- a/src/common/core.h
+++ b/src/common/core.h
@@ -14,6 +14,12 @@ extern char **arg_v;
 /// @see E_CORE_ST
 extern int runflag;
 extern char *SERVER_NAME;
+
+#define ATHENA_SERVER_NONE	0	// not defined
+#define ATHENA_SERVER_LOGIN	1	// login server
+#define ATHENA_SERVER_CHAR	2	// char server
+#define ATHENA_SERVER_INTER	4	// inter server
+#define ATHENA_SERVER_MAP	8	// map server
 extern char SERVER_TYPE;
 
 extern int parse_console(const char* buf);
diff --git a/src/common/plugins.c b/src/common/plugins.c
index 2d50fc9e8..937ec0aaa 100644
--- a/src/common/plugins.c
+++ b/src/common/plugins.c
@@ -7,7 +7,6 @@
 #include "../common/utils.h" // findfile()
 #include "../common/socket.h"
 #include "../common/malloc.h"
-#include "../common/version.h"
 #include "../common/showmsg.h"
 #include "plugins.h"
 
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index b77bf3949..4d09e2c53 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -5,7 +5,6 @@
 #include "../common/strlib.h" // StringBuf
 #include "showmsg.h"
 #include "core.h" //[Ind] - For SERVER_TYPE
-#include "version.h" //[Ind] - For SERVER_TYPE values
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/common/version.h b/src/common/version.h
deleted file mode 100644
index 71a93dcd9..000000000
--- a/src/common/version.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Athena Dev Teams - Licensed under GNU GPL
-// For more information, see LICENCE in the main folder
-
-#ifndef _VERSION_H_
-#define _VERSION_H_
-
-#define ATHENA_MAJOR_VERSION	1	// Major Version
-#define ATHENA_MINOR_VERSION	0	// Minor Version
-#define ATHENA_REVISION			0	// Revision
-
-#define ATHENA_RELEASE_FLAG		1	// 1=Develop,0=Stable
-#define ATHENA_OFFICIAL_FLAG	1	// 1=Mod,0=Official
-
-#define ATHENA_SERVER_NONE	0	// not defined
-#define ATHENA_SERVER_LOGIN	1	// login server
-#define ATHENA_SERVER_CHAR	2	// char server
-#define ATHENA_SERVER_INTER	4	// inter server
-#define ATHENA_SERVER_MAP	8	// map server
-
-// ATHENA_MOD_VERSIONはパッチ番号です。
-// これは無理に変えなくても気が向いたら変える程度の扱いで。
-// （毎回アップロードの度に変更するのも面倒と思われるし、そもそも
-// 　この項目を参照する人がいるかどうかで疑問だから。）
-// その程度の扱いなので、サーバーに問い合わせる側も、あくまで目安程度の扱いで
-// あんまり信用しないこと。
-// 鯖snapshotの時や、大きな変更があった場合は設定してほしいです。
-// C言語の仕様上、最初に0を付けると8進数になるので間違えないで下さい。
-#define ATHENA_MOD_VERSION	1249	// mod version (patch No.)
-
-#endif /* _VERSION_H_ */