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

[aCaB]

The following commit has been merged in the debian/unstable branch:
commit b8d835e9efb2ce65f5381b5a4e8177a3e10e0506
Author: aCaB <acab at clamav.net>
Date:   Tue Nov 17 12:40:08 2009 +0100

    unify DUPMAX def

diff --git a/libclamav/regex/regcomp.c b/libclamav/regex/regcomp.c
index f711603..d066183 100644
--- a/libclamav/regex/regcomp.c
+++ b/libclamav/regex/regcomp.c
@@ -138,12 +138,6 @@ static char nuls[10];		/* place to point scanner in event of error */
 #define	THERETHERE()	(p->slen - 2)
 #define	DROP(n)	(p->slen -= (n))
 
-#ifdef	_POSIX2_RE_DUP_MAX
-#define	DUPMAX	_POSIX2_RE_DUP_MAX
-#else
-#define	DUPMAX	255
-#endif
-
 #ifndef NDEBUG
 static int never = 0;		/* for use in asserts; shuts lint up */
 #else
diff --git a/libclamav/regex/utils.h b/libclamav/regex/utils.h
index b258188..e2164bc 100644
--- a/libclamav/regex/utils.h
+++ b/libclamav/regex/utils.h
@@ -36,7 +36,11 @@
  */
 
 /* utility definitions */
-#define	DUPMAX		_POSIX2_RE_DUP_MAX	/* xxx is this right? */
+#ifdef  _POSIX2_RE_DUP_MAX
+#define DUPMAX  _POSIX2_RE_DUP_MAX
+#else
+#define DUPMAX  255
+#endif
 #define	INFINITY	(DUPMAX + 1)
 #define	NC		(CHAR_MAX - CHAR_MIN + 1)
 typedef unsigned char uch;

-- 
Debian repository for ClamAV