Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[mr2930] Fix define conflict .

  • Loading branch information...
commit 47d4974ea30a742795dd72d8133757ebe2e3a2c6 1 parent 29bf5f6
@mns mns authored
View
6 config.h.cmake
@@ -1,5 +1,5 @@
-#ifndef HAVE_CONFIG_H
-#define HAVE_CONFIG_H
+#ifndef MANGOS_CONFIG_H
+#define MANGOS_CONFIG_H
#cmakedefine HAVE_ACE_STACK_TRACE_H
@@ -9,4 +9,4 @@
#define CLIENT_VERSION ${CLIENT_VERSION}
-#endif /* HAVE_CONFIG_H */
+#endif /* MANGOS_CONFIG_H */
View
2  contrib/extractor/libmpq/extract.cpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
+#ifdef MANGOS_CONFIG_H
#include "config.h"
#endif
View
2  dep/include/gsoap/stdsoap2.h
@@ -205,7 +205,7 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# endif
#endif
-#ifdef HAVE_CONFIG_H
+#ifdef MANGOS_CONFIG_H
# include "config.h"
# if defined(WITH_OPENSSL)
# ifndef HAVE_OPENSSL_SSL_H
View
4 src/shared/Common.h
@@ -20,7 +20,7 @@
#define MANGOSSERVER_COMMON_H
// config.h needs to be included 1st
-#ifdef HAVE_CONFIG_H
+#ifdef MANGOS_CONFIG_H
#ifdef PACKAGE
#undef PACKAGE
#endif //PACKAGE
@@ -50,7 +50,7 @@
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
#undef VERSION
-#endif //HAVE_CONFIG_H
+#endif //MANGOS_CONFIG_H
#include "Platform/Define.h"
View
2  src/shared/Errors.h
@@ -21,7 +21,7 @@
#include "Common.h"
-#ifndef HAVE_CONFIG_H
+#ifndef MANGOS_CONFIG_H
# define HAVE_ACE_STACK_TRACE_H 1
#endif
View
4 src/shared/SystemConfig.h.in
@@ -101,9 +101,7 @@
#define _FULLVERSION(REVN) _PACKAGENAME "/" _VERSION(REVN)
#define _R2FULLVERSION(REVD,REVT,REVN,REVH) _R2VERSION(REVD,REVT,REVN,REVH) " for " _ENDIAN_PLATFORM
-#define EXPECTED_MANGOSD_CLIENT_BUILD {${CLIENT_VERSION}, 0}
-
-#define CLIENT_VERSION ${CLIENT_VERSION}
+#define EXPECTED_MANGOSD_CLIENT_BUILD {CLIENT_VERSION, 0}
#if CLIENT_VERSION >= 16057
#define MAX_EXPANSION 4
View
2  src/shared/revision_R2.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_R2_H__
#define __REVISION_R2_H__
- #define REVISION_R2 "2929"
+ #define REVISION_R2 "2930"
#endif // __REVISION_R2_H__
Please sign in to comment.
Something went wrong with that request. Please try again.