@@ -35,6 +35,7 @@

 #include "matcher-ac.h"

 #include "matcher-pcre.h"

 #include "mpool.h"

+#include "readdb.h"

 #include "regex_pcre.h"

 #if HAVE_PCRE

@@ -77,7 +78,7 @@ static void pcre_perf_events_init(struct cli_pcre_meta *pm, const char *virname)

         virname = "(null)";

     /* set the name */

-    pm->statname = cli_calloc(1, namelen);

+    pm->statname = (char*)cli_calloc(1, namelen);

     if (!pm->statname) {

         return;

     }

@@ -113,8 +114,8 @@ struct sigperf_elem {

 static int sigelem_comp(const void * a, const void * b)

 {

-    const struct sigperf_elem *ela = a;

-    const struct sigperf_elem *elb = b;

+    const struct sigperf_elem *ela = (const struct sigperf_elem *)a;

+    const struct sigperf_elem *elb = (const struct sigperf_elem *)b;

     return elb->usecs/elb->run_count - ela->usecs/ela->run_count;

 }

@@ -56,6 +56,7 @@

 #include "bytecode_priv.h"

 #include "bytecode_api_impl.h"

 #include "yara_clam.h"

+#include "yara_exec.h"

 #ifdef CLI_PERF_LOGGING

@@ -76,6 +76,7 @@

 #include "bytecode.h"

 #include "bytecode_api_impl.h"

 #include "cache.h"

+#include "readdb.h"

 #include "stats.h"

 int (*cli_unrar_open)(int fd, const char *dirname, unrar_state_t *state);

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

 #endif

 #include <stdio.h>

+#include <stdint.h>

 #include <stdlib.h>

 #include <string.h>

 #include <ctype.h>

@@ -83,6 +84,8 @@ static pthread_mutex_t cli_ref_mutex = PTHREAD_MUTEX_INITIALIZER;

 #endif

 #include "yara_clam.h"

 #include "yara_compiler.h"

+#include "yara_grammar.h"

+#include "yara_lexer.h"

 #define MAX_LDB_SUBSIGS 64

@@ -18,6 +18,10 @@ limitations under the License.

 #include <stdio.h>

 #include <string.h>

+#ifdef _WIN32

+#include <stdint.h>

+#endif

+

 #ifdef REAL_YARA

 #include <yara/utils.h>

 #include <yara/compiler.h>

@@ -55,6 +55,8 @@ typedef unsigned char flex_uint8_t;

 typedef unsigned short int flex_uint16_t;

 typedef unsigned int flex_uint32_t;

+/* Windows' <stdint.h> does not wrap its macro definitions */

+#ifndef _WIN32

 /* Limits of integral types. */

 #ifndef INT8_MIN

 #define INT8_MIN               (-128)

@@ -84,6 +86,8 @@ typedef unsigned int flex_uint32_t;

 #define UINT32_MAX             (4294967295U)

 #endif

+#endif /* ! _WIN32 */

+

 #endif /* ! C99 */

 #endif /* ! FLEXINT_H */

@@ -145,6 +145,9 @@ struct qm_trace {

 #define	TRASHIT(x)

 #endif	/* QUEUE_MACRO_DEBUG */

+/* SLIST_ENTRY macro collides with winnt.h definition */

+#ifndef _WIN32

+

 /*

  * Singly-linked List declarations.

  */

@@ -238,6 +241,8 @@ struct {								\

 	SLIST_FIRST(head2) = swap_first;				\

 } while (0)

+#endif /* ! _WIN32 */

+

 /*

  * Singly-linked Tail queue declarations.

  */

@@ -1998,7 +1998,7 @@ static void matchsig(const char *sig, const char *offset, int fd)

 	return;

     }

-    if(cli_parse_add(engine->root[0], "test", sig, NULL, 0, 0, "*", 0, NULL, 0) != CL_SUCCESS) {

+    if(cli_parse_add(engine->root[0], "test", sig, 0, 0, 0, "*", 0, NULL, 0) != CL_SUCCESS) {

 	mprintf("!matchsig: Can't parse signature\n");

 	cl_engine_free(engine);

 	return;

@@ -2907,7 +2907,7 @@ static int dumpcerts(const struct optstruct *opts)

 	return -1;

     }

-    if(cli_parse_add(engine->root[0], "test", "deadbeef", NULL, 0, 0, "*", 0, NULL, 0) != CL_SUCCESS) {

+    if(cli_parse_add(engine->root[0], "test", "deadbeef", 0, 0, 0, "*", 0, NULL, 0) != CL_SUCCESS) {

 	mprintf("!dumpcerts: Can't parse signature\n");

 	cl_engine_free(engine);

 	return -1;