From 5da460c29a7a47f00ff1891ea6003590ed6f4e4f Mon Sep 17 00:00:00 2001 From: AlexDereka Date: Fri, 5 Jun 2009 15:05:45 +0400 Subject: [PATCH] [7962] Fixed compilation on OpenBSD. Remove outdated options from configure.ac. --- configure.ac | 37 ------------------------------------ dep/include/sockets/socket_include.h | 2 +- dep/src/g3dlite/System.cpp | 4 ++++ src/shared/Database/Database.h | 8 ++++---- src/shared/revision_nr.h | 2 +- 5 files changed, 10 insertions(+), 43 deletions(-) diff --git a/configure.ac b/configure.ac index fbbc65d9c..b41a20cf3 100644 --- a/configure.ac +++ b/configure.ac @@ -163,39 +163,6 @@ Debugging options: ]) AC_MSG_RESULT($MANGOSD_DEBUG_INFO) - -# Enable CLI console? -AC_MSG_CHECKING(whether cli console is enabled) -MANGOSD_ENABLE_CLI=no -AC_ARG_ENABLE(cli, -[ --enable-cli Turn on command console system], -[ - if test "$enableval" = "yes" ; then - CFLAGS="-DENABLE_CLI $CFLAGS" - CXXFLAGS="-DENABLE_CLI $CXXFLAGS" - MANGOSD_ENABLE_CLI=yes - elif test "$withval" != "no" ; then - AC_MSG_ERROR(Please choose yes or no) - fi -]) -AC_MSG_RESULT($MANGOSD_ENABLE_CLI) - -# Enable remote console? -AC_MSG_CHECKING(whether remote console is enabled) -MANGOSD_ENABLE_RA=no -AC_ARG_ENABLE(ra, -[ --enable-ra Turn on remote console system], -[ - if test "$enableval" = "yes" ; then - CFLAGS="-DENABLE_RA $CFLAGS" - CXXFLAGS="-DENABLE_RA $CXXFLAGS" - MANGOSD_ENABLE_RA=yes - elif test "$withval" != "no" ; then - AC_MSG_ERROR(Please choose yes or no) - fi -]) -AC_MSG_RESULT($MANGOSD_ENABLE_RA) - ## Check for required header files. AC_HEADER_STDC AC_HEADER_DIRENT @@ -211,10 +178,8 @@ AC_CHECK_HEADERS([zlib.h]) AC_HEADER_STDBOOL AC_C_CONST AC_C_INLINE -AC_TYPE_SIZE_T AC_HEADER_TIME AC_STRUCT_TM -AC_TYPE_UINT64_T AC_C_VOLATILE AC_CHECK_TYPES([ptrdiff_t]) @@ -272,8 +237,6 @@ MANGOS_LIBS="$POSTGRE_LIBS $MYSQL_LIBS $ZLIB $COMPATLIB $SSLLIB $MANGOS_LIBS" ## Export defined variables AC_SUBST(DOXYGEN) AC_SUBST(MANGOSD_DEBUG_INFO) -AC_SUBST(MANGOSD_ENABLE_CLI) -AC_SUBST(MANGOSD_ENABLE_RA) ## Additional CPPFLAGS and LDFLAGS. AC_SUBST(MANGOS_INCLUDES) diff --git a/dep/include/sockets/socket_include.h b/dep/include/sockets/socket_include.h index 34e7a8ca5..b2d55bc19 100644 --- a/dep/include/sockets/socket_include.h +++ b/dep/include/sockets/socket_include.h @@ -150,7 +150,7 @@ namespace SOCKETS_NAMESPACE { # error FreeBSD versions prior to 400014 does not support ipv6 # endif -#elif defined __NetBSD__ +#elif defined (__NetBSD__) || defined (__OpenBSD__) # if !defined(MSG_NOSIGNAL) # define MSG_NOSIGNAL 0 # endif diff --git a/dep/src/g3dlite/System.cpp b/dep/src/g3dlite/System.cpp index 06be7cd25..3f129af61 100644 --- a/dep/src/g3dlite/System.cpp +++ b/dep/src/g3dlite/System.cpp @@ -23,6 +23,10 @@ #include "G3D/debug.h" #include "G3D/format.h" +#if defined(__OpenBSD__) + #include +#endif + #ifdef G3D_WIN32 #include diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index fbfd4d6a5..da3e9a706 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -79,16 +79,16 @@ class MANGOS_DLL_SPEC Database template bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) ATTR_PRINTF(5,6); template - bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *format,...) ATTR_PRINTF(5,6); + bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *format,...) ATTR_PRINTF(6,7); template - bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *format,...) ATTR_PRINTF(5,6); + bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *format,...) ATTR_PRINTF(7,8); // PQuery / static template - bool AsyncPQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) ATTR_PRINTF(5,6); + bool AsyncPQuery(void (*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) ATTR_PRINTF(4,5); template bool AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *format,...) ATTR_PRINTF(5,6); template - bool AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *format,...) ATTR_PRINTF(5,6); + bool AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2, ParamType3), ParamType1 param1, ParamType2 param2, ParamType3 param3, const char *format,...) ATTR_PRINTF(6,7); template // QueryHolder bool DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, SqlQueryHolder*), SqlQueryHolder *holder); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4cedafe21..d64029851 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7961" + #define REVISION_NR "7962" #endif // __REVISION_NR_H__ -- 2.11.4.GIT