[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 46026ca7216422fa52059ffb4d72b05e20deb4ad
Author: aCaB <acab at clamav.net>
Date:   Fri Jul 17 02:52:39 2009 +0200

    3rd time a charm. tested.

diff --git a/libclamav/others.h b/libclamav/others.h
index 0a24acd..bfbdfc4 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -369,6 +369,10 @@ void cli_dbgmsg_internal(const char *str, ...) __attribute__((format(printf, 1,
 void cli_dbgmsg_internal(const char *str, ...);
 #endif
 
+#ifdef HAVE_CLI_GETPAGESIZE
+#undef HAVE_CLI_GETPAGESIZE
+#endif
+
 #if HAVE_SYSCONF_SC_PAGESIZE
 static inline int cli_getpagesize() { return sysconf(_SC_PAGESIZE); }
 #define HAVE_CLI_GETPAGESIZE 1
@@ -377,9 +381,6 @@ static inline int cli_getpagesize() { return sysconf(_SC_PAGESIZE); }
 static inline int cli_getpagesize() { return getpagesize(); }
 #define HAVE_CLI_GETPAGESIZE 1
 #endif
-#ifdef HAVE_CLI_GETPAGESIZE
-#undef HAVE_CLI_GETPAGESIZE
-#endif
 #endif
 
 void *cli_malloc(size_t nmemb);

-- 
Debian repository for ClamAV