summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-31 01:59:16 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-31 01:59:16 +0300
commit366de9963d24841483e6ed8ff4a88f775a1c2fcf (patch)
tree087cfce87b177e792d51444005d34ff2983af24e
parent44f92f0feec1cad267fe8584a5a275de98134b4a (diff)
downloadplus-366de9963d24841483e6ed8ff4a88f775a1c2fcf.tar.gz
plus-366de9963d24841483e6ed8ff4a88f775a1c2fcf.tar.bz2
plus-366de9963d24841483e6ed8ff4a88f775a1c2fcf.tar.xz
plus-366de9963d24841483e6ed8ff4a88f775a1c2fcf.zip
Rename packetdefine.h to protocoldefine.h
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/net/eathena/protocol.h3
-rw-r--r--src/net/protocoldefine.h (renamed from src/net/packetdefine.h)0
-rw-r--r--src/net/tmwa/protocol.h2
5 files changed, 5 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc285ef7d..479d6544d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -574,9 +574,9 @@ SET(SRCS
net/worldinfo.h
net/packetcounters.cpp
net/packetcounters.h
- net/packetdefine.h
net/packetlimiter.cpp
net/packetlimiter.h
+ net/protocoldefine.h
resources/action.cpp
resources/action.h
resources/ambientlayer.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 1c5e64350..144d4118b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1178,9 +1178,9 @@ manaplus_SOURCES += main.cpp \
net/worldinfo.h \
net/packetcounters.cpp \
net/packetcounters.h \
- net/packetdefine.h \
net/packetlimiter.cpp \
net/packetlimiter.h \
+ net/protocoldefine.h \
net/ea/adminrecv.cpp \
net/ea/adminrecv.h \
net/ea/adminhandler.cpp \
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 221066df5..21dab17d7 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -23,7 +23,8 @@
#ifndef NET_EATHENA_PROTOCOL_H
#define NET_EATHENA_PROTOCOL_H
-#include "net/packetdefine.h"
+#include "net/protocoldefine.h"
+
#include "net/eathena/packets.inc"
#undef packet
diff --git a/src/net/packetdefine.h b/src/net/protocoldefine.h
index a44289994..a44289994 100644
--- a/src/net/packetdefine.h
+++ b/src/net/protocoldefine.h
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index fc53778b1..564dfb8a7 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -23,7 +23,7 @@
#ifndef NET_TMWA_PROTOCOL_H
#define NET_TMWA_PROTOCOL_H
-#include "net/packetdefine.h"
+#include "net/protocoldefine.h"
#include "net/tmwa/packets.inc"