[7962] Fixed compilation on OpenBSD. Author: AlexDereka

    Remove outdated options from configure.ac.

--HG--
branch : trunk

4 files changed, 16 insertions, 49 deletions

diff --git a/configure.ac b/configure.ac
index d1ec818ac99..bd2b492ebeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,39 +183,6 @@ Debugging options:
 ])
 AC_MSG_RESULT($TRINITYD_DEBUG_INFO)
 
-
-# Enable CLI console?
-AC_MSG_CHECKING(whether cli console is enabled)
-TRINITYD_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"
-	TRINITYD_ENABLE_CLI=yes
-    elif test "$withval" != "no" ; then
-	AC_MSG_ERROR(Please choose yes or no)
-    fi
-])
-AC_MSG_RESULT($TRINITYD_ENABLE_CLI)
-
-# Enable remote console?
-AC_MSG_CHECKING(whether remote console is enabled)
-TRINITYD_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"
-	TRINITYD_ENABLE_RA=yes
-    elif test "$withval" != "no" ; then
-	AC_MSG_ERROR(Please choose yes or no)
-    fi
-])
-AC_MSG_RESULT($TRINITYD_ENABLE_RA)
-
 # Enable large cells?
 AC_MSG_CHECKING(whether we use large cells)
 TRINITYD_ENABLE_LC=no
@@ -263,10 +230,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])
 
@@ -324,8 +289,6 @@ TRINI_LIBS="$POSTGRE_LIBS $MYSQL_LIBS $ZLIB $COMPATLIB $SSLLIB $TRINI_LIBS"
 ## Export defined variables
 AC_SUBST(DOXYGEN)
 AC_SUBST(TRINITYD_DEBUG_INFO)
-AC_SUBST(TRINITYD_ENABLE_CLI)
-AC_SUBST(TRINITYD_ENABLE_RA)
 
 ## Additional CPPFLAGS and LDFLAGS.
 AC_SUBST(TRINI_INCLUDES)
diff --git a/dep/include/sockets/socket_include.h b/dep/include/sockets/socket_include.h
index 31960ccee05..dcfd4acfbd6 100644
--- a/dep/include/sockets/socket_include.h
+++ b/dep/include/sockets/socket_include.h
@@ -150,14 +150,14 @@ namespace SOCKETS_NAMESPACE {
 #  error FreeBSD versions prior to 400014 does not support ipv6
 # endif
 
-#elif defined __NetBSD__
-#  if !defined(MSG_NOSIGNAL)
-#   define MSG_NOSIGNAL 0
-#  endif
-#  include <netinet/in.h>
-typedef in_addr_t ipaddr_t;
-typedef in_port_t port_t;
-#elif defined MACOSX
+#elif defined (__NetBSD__) || defined (__OpenBSD__)
+#  if !defined(MSG_NOSIGNAL)  
+#   define MSG_NOSIGNAL 0  
+#  endif  
+#  include <netinet/in.h>  
+typedef in_addr_t ipaddr_t;  
+typedef in_port_t port_t;  
+#elif defined MACOSX 
 // ----------------------------------------
 // Mac OS X
 #include <string.h>
diff --git a/dep/src/g3dlite/System.cpp b/dep/src/g3dlite/System.cpp
index cb7169a4c4d..88fd39b52ca 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 <stdint.h>
+#endif
+
 #ifdef G3D_WIN32
 
     #include <conio.h>
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index 493ec8a76c0..7f2bdaefdb7 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -81,16 +81,16 @@ class TRINITY_DLL_SPEC Database
         template<class Class, typename ParamType1>
             bool AsyncPQuery(Class *object, void (Class::*method)(QueryResult*, ParamType1), ParamType1 param1, const char *format,...) ATTR_PRINTF(5,6);
         template<class Class, typename ParamType1, typename ParamType2>
-            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<class Class, typename ParamType1, typename ParamType2, typename ParamType3>
-            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<typename ParamType1>
-            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<typename ParamType1, typename ParamType2>
             bool AsyncPQuery(void (*method)(QueryResult*, ParamType1, ParamType2), ParamType1 param1, ParamType2 param2, const char *format,...) ATTR_PRINTF(5,6);
         template<typename ParamType1, typename ParamType2, typename ParamType3>
-            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<class Class>
         // QueryHolder
             bool DelayQueryHolder(Class *object, void (Class::*method)(QueryResult*, SqlQueryHolder*), SqlQueryHolder *holder);