[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-167-g4319a8f

[edwin]

The following commit has been merged in the debian/unstable branch:
commit b6afc020037cec4a96da85f9e70c1dfaf0feedd8
Author: edwin <edwin at 77e5149b-7576-45b1-b177-96237e5ba77b>
Date:   Thu Apr 23 13:55:22 2009 +0000

    errno is not thread-safe on AIX by default, ask for thread-safe version. (bb #1480)
    Default stack size on AIX is too small, define BIGSTACK by default. (bb #1481).
    
    git-svn-id: http://svn.clamav.net/svn/clamav-devel/trunk@5054 77e5149b-7576-45b1-b177-96237e5ba77b

diff --git a/ChangeLog b/ChangeLog
index 9e4e1f1..f28190e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 23 16:54:54 EEST 2009 (edwin)
+-------------------------------------
+ * clamav-config.h.in, clamd/thrmgr.c, configure, configure.in: errno
+ is not thread-safe on AIX by default, ask for thread-safe version.
+ (bb #1480) Default stack size on AIX is too small, define BIGSTACK
+ by default. (bb #1481).
+
 Thu Apr 23 15:23:02 CEST 2009 (tk)
 ----------------------------------
  * libclamav: call cli_checkfp() whenever possible/makes sense (bb#1558)
diff --git a/clamav-config.h.in b/clamav-config.h.in
index 613264f..f94adea 100644
--- a/clamav-config.h.in
+++ b/clamav-config.h.in
@@ -517,6 +517,9 @@
 /* thread safe */
 #undef _REENTRANT
 
+/* thread safe */
+#undef _THREAD_SAFE
+
 /* Define so that glibc/gnulib argp.h does not typedef error_t. */
 #undef __error_t_defined
 
diff --git a/clamd/thrmgr.c b/clamd/thrmgr.c
index a9d93e9..1ba2aa8 100644
--- a/clamd/thrmgr.c
+++ b/clamd/thrmgr.c
@@ -44,7 +44,7 @@
 #define TRUE (1)
 
 /* BSD and HP-UX need a bigger stacksize than the system default */
-#if defined (C_BSD) || defined (C_HPUX)
+#if defined (C_BSD) || defined (C_HPUX) || defined(C_AIX)
 #define C_BIGSTACK 1
 #endif
 
diff --git a/configure b/configure
index 48e2909..f519147 100755
--- a/configure
+++ b/configure
@@ -20814,6 +20814,11 @@ cat >>confdefs.h <<\_ACEOF
 #define _REENTRANT 1
 _ACEOF
 
+
+cat >>confdefs.h <<\_ACEOF
+#define _THREAD_SAFE 1
+_ACEOF
+
     fi
 
 cat >>confdefs.h <<\_ACEOF
diff --git a/configure.in b/configure.in
index 54fd171..e454af1 100644
--- a/configure.in
+++ b/configure.in
@@ -1049,6 +1049,7 @@ aix*)
 	TH_SAFE="-thread-safe"
 	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
 	AC_DEFINE([_REENTRANT],1,[thread safe])
+	AC_DEFINE([_THREAD_SAFE],1,[thread safe])
     fi
     AC_DEFINE([C_AIX],1,[os is aix])
     ;;

-- 
Debian repository for ClamAV