From e3b02f3d1977ef6eb18d91474e113cba1d3de710 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 21 Sep 2015 23:13:35 +0300 Subject: Rename protocoloutdefine.h into protocoloutincludedefine.h --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/net/eathena/protocolout.h | 2 +- src/net/protocoloutdefine.h | 26 -------------------------- src/net/protocoloutinclude.h | 26 ++++++++++++++++++++++++++ src/net/tmwa/protocolout.h | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 src/net/protocoloutdefine.h create mode 100644 src/net/protocoloutinclude.h 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/protocoloutdefine.h deleted file mode 100644 index ed739e2a0..000000000 --- a/src/net/protocoloutdefine.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2015 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 . - */ - -#ifndef NET_PROTOCOLOUTDEFINE_H -#define NET_PROTOCOLOUTDEFINE_H - -#define packet(name, id) static const int name = id - -#endif // NET_PROTOCOLOUTDEFINE_H diff --git a/src/net/protocoloutinclude.h b/src/net/protocoloutinclude.h new file mode 100644 index 000000000..46ab3ecc4 --- /dev/null +++ b/src/net/protocoloutinclude.h @@ -0,0 +1,26 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 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 . + */ + +#ifndef NET_PROTOCOLOUTINCLUDE_H +#define NET_PROTOCOLOUTINCLUDE_H + +#define packet(name, id) static const int name = id + +#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 -- cgit v1.2.3-60-g2f50