@@ -23,6 +23,7 @@

 #include <fcntl.h>

 #include <string.h>

 #include "checks.h"

+#include "../libclamav/fmap.h"

 #include "../libclamav/dconf.h"

 #include "../libclamav/htmlnorm.h"

 #include "../libclamav/others.h"

@@ -106,7 +107,7 @@ START_TEST (test_htmlnorm_api)

 {

 	int fd;

 	tag_arguments_t hrefs;

-	struct F_MAP *map;

+	fmap_t *map;

 	memset(&hrefs, 0, sizeof(hrefs));

@@ -116,7 +116,7 @@ START_TEST (test_bm_scanbuff) {

     ret = cli_parse_add(root, "Sig3", "babedead", 0, 0, "*", 0, NULL, 0);

     fail_unless(ret == CL_SUCCESS, "cli_parse_add() failed");

-    ret = cli_bm_scanbuff("blah\xde\xad\xbe\xef", 12, &virname, NULL, root, 0, -1, NULL);

+    ret = cli_bm_scanbuff("blah\xde\xad\xbe\xef", 12, &virname, NULL, root, 0, NULL, NULL);

     fail_unless(ret == CL_VIRUS, "cli_bm_scanbuff() failed");

     fail_unless(!strncmp(virname, "Sig2", 4), "Incorrect signature matched in cli_bm_scanbuff()\n");

     cli_bm_free(root);