From 727399dbcf4dfc5b94c6b4a6fdc7b46f2c1597c0 Mon Sep 17 00:00:00 2001
From: The TorPSYC Team <psyc://7yuogiqxgrak36kk.onion/@team>
Date: Fri, 27 Sep 2013 22:14:33 +0200
Subject: [PATCH] stupid question, we use #if

---
 src/autoconf/configure.in | 13 ++++++++++++-
 src/strfuns.c             |  6 ++++++
 src/version.sh            |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/autoconf/configure.in b/src/autoconf/configure.in
index 2b1c94a..607ee95 100644
--- a/src/autoconf/configure.in
+++ b/src/autoconf/configure.in
@@ -1316,9 +1316,11 @@ for TESTPATH in "" "/usr/local/include"; do
     if test "x$TESTPATH" != "x"; then
         CFLAGS="-I$TESTPATH $saveflags"
     fi
-# it's sys/iconv.h for BSD.. how do we support both paths?
 AC_TRY_COMPILE([
+#if defined(__linux__)
 #include <iconv.h>
+#else
+#include <sys/iconv.h>
 #endif
 
 iconv_t * foo(void)
@@ -1350,7 +1352,11 @@ if test "x$lp_cv_has_iconv" = "xyes"; then
     tcomp2='${CC-cc} ${CFLAGS} -o conftest.o -c conftest.c 2>&1'
     cat > conftest.c <<EOF
 #include <stdlib.h>
+#if defined(__linux__)
 #include <iconv.h>
+#else
+#include <sys/iconv.h>
+#endif
 
 int foo(void)
 {
@@ -1378,7 +1384,12 @@ EOF
     AC_CACHE_CHECK(if -liconv is needed, lp_cv_need_lib_iconv,
         AC_TRY_RUN([
 #include <stdlib.h>
+#if defined(__linux__)
 #include <iconv.h>
+#else
+#include <sys/iconv.h>
+#endif
+
 int t (void)
 {
     return iconv(NULL, NULL, NULL, NULL, NULL);
diff --git a/src/strfuns.c b/src/strfuns.c
index fc104a9..9a5f1cc 100644
--- a/src/strfuns.c
+++ b/src/strfuns.c
@@ -37,7 +37,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
+
+/* if this check is stupid, please fix it also in configure.in */
+#if defined(__linux__)
 #include <iconv.h>
+#else
+#include <sys/iconv.h>
+#endif
 
 #include "strfuns.h"
 
diff --git a/src/version.sh b/src/version.sh
index 5dfcdc9..0cabba5 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -17,7 +17,7 @@ version_longtype="stable"
 # A timestamp, to be used by bumpversion and other scripts.
 # It can be used, for example, to 'touch' this file on every build, thus
 # forcing revision control systems to add it on every checkin automatically.
-version_stamp="Mon Aug 29 16:41:20 CEST 2011"
+version_stamp="Fri Sep 27 22:12:45 CEST 2013"
 
 # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
 version_major=4