update

git-svn: trunk@1896

clamav-devel/clamscan/options.c

@@ -93,7 +93,7 @@ int main(int argc, char **argv)
             {"max-ratio", 1, 0, 0},
 	    {"max-recursion", 1, 0, 0},
 	    {"max-dir-recursion", 1, 0, 0},
-#ifdef HWACCEL
+#ifdef HAVE_HWACCEL
 	    {"hwaccel", 0, 0, 0},
 #endif
 	    {"disable-archive", 0, 0, 0},

clamav-devel/libclamav/readdb.c

@@ -1056,6 +1056,9 @@ static int cli_load(const char *filename, struct cl_engine **engine, unsigned in
     } else if(cli_strbcasestr(filename, ".rmd")) {
 	ret = cli_loadmd(fd, engine, signo, 2, options);
 
+    } else if(cli_strbcasestr(filename, ".hw")) {
+	/* ignore */
+
     } else {
 	cli_dbgmsg("cli_load: unknown extension - assuming old database format\n");
 	ret = cli_loaddb(fd, engine, signo, options);