mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 00:46:46 +00:00
c++11 linux compile conflicts with perl
This commit is contained in:
@@ -32,6 +32,10 @@ typedef const char Const_char;
|
|||||||
#include "EQWParser.h"
|
#include "EQWParser.h"
|
||||||
#include "EQLConfig.h"
|
#include "EQLConfig.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
#undef THIS
|
#undef THIS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -32,6 +32,10 @@ typedef const char Const_char;
|
|||||||
#include "EQWParser.h"
|
#include "EQWParser.h"
|
||||||
#include "EQW.h"
|
#include "EQW.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
#undef THIS
|
#undef THIS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -32,6 +32,10 @@ typedef const char Const_char;
|
|||||||
#include "EQWParser.h"
|
#include "EQWParser.h"
|
||||||
#include "HTTPRequest.h"
|
#include "HTTPRequest.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
#undef THIS
|
#undef THIS
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "PlayerCorpse.h"
|
#include "PlayerCorpse.h"
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
#include "titles.h"
|
#include "titles.h"
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "doors.h"
|
#include "doors.h"
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
|
|||||||
@@ -31,6 +31,10 @@
|
|||||||
#include <list>
|
#include <list>
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "entity.h"
|
#include "entity.h"
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "groups.h"
|
#include "groups.h"
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
|
|||||||
@@ -22,6 +22,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "../common/linked_list.h"
|
#include "../common/linked_list.h"
|
||||||
#include "hate_list.h"
|
#include "hate_list.h"
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef const char Const_char;
|
typedef const char Const_char;
|
||||||
|
|
||||||
#include "mob.h"
|
#include "mob.h"
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
typedef const char Const_char;
|
typedef const char Const_char;
|
||||||
|
|
||||||
#include "npc.h"
|
#include "npc.h"
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "object.h"
|
#include "object.h"
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "perlpacket.h"
|
#include "perlpacket.h"
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
|
|||||||
@@ -22,6 +22,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "../common/Item.h"
|
#include "../common/Item.h"
|
||||||
|
|
||||||
#ifdef THIS /* this macro seems to leak out on some systems */
|
#ifdef THIS /* this macro seems to leak out on some systems */
|
||||||
|
|||||||
@@ -30,6 +30,10 @@
|
|||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "embperl.h"
|
#include "embperl.h"
|
||||||
|
|
||||||
|
#ifdef seed
|
||||||
|
#undef seed
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "raids.h"
|
#include "raids.h"
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user