[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 9cf071682831a02bff6197fa28a9983bcef2bebb
Author: aCaB <acab at clamav.net>
Date:   Thu Sep 24 19:09:10 2009 +0200

    drop interix

diff --git a/ChangeLog b/ChangeLog
index ae27be9..7aad9f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 24 19:07:59 CEST 2009 (acab)
+------------------------------------
+ * clamd, libclamav: drop INTERIX "support"
+
 Thu Sep 24 19:05:06 CEST 2009 (acab)
 ------------------------------------
  * win32 paths handling
diff --git a/clamd/others.c b/clamd/others.c
index ddb097b..bcb014f 100644
--- a/clamd/others.c
+++ b/clamd/others.c
@@ -57,11 +57,6 @@
 #endif
 
 #include <pthread.h>
-/* submitted by breiter at wolfereiter.com: do not use poll(2) on Interix */
-#ifdef C_INTERIX
-#undef HAVE_POLL
-#undef HAVE_POLL_H
-#endif
 
 #if HAVE_POLL
 #if HAVE_POLL_H
diff --git a/libclamav/readdb.c b/libclamav/readdb.c
index 300a454..f4696b7 100644
--- a/libclamav/readdb.c
+++ b/libclamav/readdb.c
@@ -1843,7 +1843,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)
 		    return CL_EMEM;
 		}
 
-#if defined(C_INTERIX) || defined(C_OS2) || defined(_WIN32)
+#if defined(C_OS2) || defined(_WIN32)
 		dbstat->statdname = (char **) cli_realloc2(dbstat->statdname, dbstat->entries * sizeof(char *));
 		if(!dbstat->statdname) {
 		    cl_statfree(dbstat);
@@ -1859,7 +1859,7 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)
 		    return CL_EMEM;
 		}
 		sprintf(fname, "%s"PATHSEP"%s", dirname, dent->d_name);
-#if defined(C_INTERIX) || defined(C_OS2) || defined(_WIN32)
+#if defined(C_OS2) || defined(_WIN32)
 		dbstat->statdname[dbstat->entries - 1] = (char *) cli_malloc(strlen(dent->d_name) + 1);
 		if(!dbstat->statdname[dbstat->entries - 1]) {
 		    cl_statfree(dbstat);
@@ -1928,7 +1928,7 @@ int cl_statchkdir(const struct cl_stat *dbstat)
 
 		found = 0;
 		for(i = 0; i < dbstat->entries; i++)
-#if defined(C_INTERIX) || defined(C_OS2) || defined(_WIN32)
+#if defined(C_OS2) || defined(_WIN32)
 		    if(!strcmp(dbstat->statdname[i], dent->d_name)) {
 #else
 		    if(dbstat->stattab[i].st_ino == sb.st_ino) {
@@ -1957,7 +1957,7 @@ int cl_statfree(struct cl_stat *dbstat)
 
     if(dbstat) {
 
-#if defined(C_INTERIX) || defined(C_OS2) || defined(_WIN32)
+#if defined(C_OS2) || defined(_WIN32)
 	    int i;
 
 	if(dbstat->statdname) {

-- 
Debian repository for ClamAV