From 90e6a97d7987e3a2ef04706f816194c5aef24422 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 17 Jun 2009 18:42:05 -0500 Subject: [8036] Move unneded defines from dotconfpp.h to dotconfpp.cpp Author: VladimirMangos This will prevent unexpected redefines and unrelated files build problems. --HG-- branch : trunk --- src/shared/Config/dotconfpp/dotconfpp.cpp | 12 ++++++++++++ src/shared/Config/dotconfpp/dotconfpp.h | 13 ------------- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'src/shared/Config/dotconfpp') diff --git a/src/shared/Config/dotconfpp/dotconfpp.cpp b/src/shared/Config/dotconfpp/dotconfpp.cpp index edb85273742..e779637256e 100644 --- a/src/shared/Config/dotconfpp/dotconfpp.cpp +++ b/src/shared/Config/dotconfpp/dotconfpp.cpp @@ -3,6 +3,18 @@ #include "dotconfpp.h" +#ifdef WIN32 +#define PATH_MAX _MAX_PATH +#define strcasecmp stricmp +#define realpath(path,resolved_path) _fullpath(resolved_path, path, _MAX_PATH) +#include +#else +#include +#include +#include +#include +#endif + #if !defined(R_OK) #define R_OK 04 #endif diff --git a/src/shared/Config/dotconfpp/dotconfpp.h b/src/shared/Config/dotconfpp/dotconfpp.h index 7887f86ccc1..51455854ee7 100644 --- a/src/shared/Config/dotconfpp/dotconfpp.h +++ b/src/shared/Config/dotconfpp/dotconfpp.h @@ -15,19 +15,6 @@ #include #include -#ifdef WIN32 -#define PATH_MAX _MAX_PATH -#define snprintf _snprintf -#define strcasecmp stricmp -#define realpath(path,resolved_path) _fullpath(resolved_path, path, _MAX_PATH) -#include -#else -#include -#include -#include -#include -#endif - #include "mempool.h" class DOTCONFDocument; -- cgit v1.2.3