summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-09-21 23:13:35 +0300
committerAndrei Karas <akaras@inbox.ru>2015-09-21 23:26:34 +0300
commite3b02f3d1977ef6eb18d91474e113cba1d3de710 (patch)
treef87ed43510281da1c237b576b6ce4c62627b2d21
parent52e799ac652c6edd48d250f814e259af44f92329 (diff)
downloadManaVerse-e3b02f3d1977ef6eb18d91474e113cba1d3de710.tar.gz
ManaVerse-e3b02f3d1977ef6eb18d91474e113cba1d3de710.tar.bz2
ManaVerse-e3b02f3d1977ef6eb18d91474e113cba1d3de710.tar.xz
ManaVerse-e3b02f3d1977ef6eb18d91474e113cba1d3de710.zip
Rename protocoloutdefine.h into protocoloutincludedefine.h
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/net/eathena/protocolout.h2
-rw-r--r--src/net/protocoloutinclude.h (renamed from src/net/protocoloutdefine.h)6
-rw-r--r--src/net/tmwa/protocolout.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 697d00766..39a94d052 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -580,7 +580,7 @@ SET(SRCS
net/packetlimiter.cpp
net/packetlimiter.h
net/protocolindefine.h
- net/protocoloutdefine.h
+ net/protocoloutinclude.h
net/recvpacketdefine.h
resources/action.cpp
resources/action.h
diff --git a/src/Makefile.am b/src/Makefile.am
index efc6b41f1..05d89919f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1191,7 +1191,7 @@ manaplus_SOURCES += main.cpp \
net/packetlimiter.cpp \
net/packetlimiter.h \
net/protocolindefine.h \
- net/protocoloutdefine.h \
+ net/protocoloutinclude.h \
net/ea/adminrecv.cpp \
net/ea/adminrecv.h \
net/ea/adminhandler.cpp \
diff --git a/src/net/eathena/protocolout.h b/src/net/eathena/protocolout.h
index 13376bcfb..4202608ac 100644
--- a/src/net/eathena/protocolout.h
+++ b/src/net/eathena/protocolout.h
@@ -21,7 +21,7 @@
#ifndef NET_EATHENA_PROTOCOLOUT_H
#define NET_EATHENA_PROTOCOLOUT_H
-#include "net/protocoloutdefine.h"
+#include "net/protocoloutinclude.h"
#include "net/eathena/packetsout.inc"
#undef packet
diff --git a/src/net/protocoloutdefine.h b/src/net/protocoloutinclude.h
index ed739e2a0..46ab3ecc4 100644
--- a/src/net/protocoloutdefine.h
+++ b/src/net/protocoloutinclude.h
@@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NET_PROTOCOLOUTDEFINE_H
-#define NET_PROTOCOLOUTDEFINE_H
+#ifndef NET_PROTOCOLOUTINCLUDE_H
+#define NET_PROTOCOLOUTINCLUDE_H
#define packet(name, id) static const int name = id
-#endif // NET_PROTOCOLOUTDEFINE_H
+#endif // NET_PROTOCOLOUTINCLUDE_H
diff --git a/src/net/tmwa/protocolout.h b/src/net/tmwa/protocolout.h
index d1e4430cb..7d5a4342b 100644
--- a/src/net/tmwa/protocolout.h
+++ b/src/net/tmwa/protocolout.h
@@ -21,7 +21,7 @@
#ifndef NET_TMWA_PROTOCOLOUT_H
#define NET_TMWA_PROTOCOLOUT_H
-#include "net/protocoloutdefine.h"
+#include "net/protocoloutinclude.h"
#include "net/tmwa/packetsout.inc"
#undef packet