Makes it workable with v3/master

Author: zimmerle

src/mod_security3.c

@@ -148,10 +148,10 @@ static msc_t *create_tx_context(request_rec *r) {
     unique_id = getenv("UNIQUE_ID");
     if (unique_id != NULL && strlen(unique_id) > 0) {
         msr->t = msc_new_transaction_with_id(msc_apache->modsec,
-            (Rules *)z->rules_set, unique_id, (void *)r);
+            z->rules_set, unique_id, (void *)r);
     } else {
         msr->t = msc_new_transaction(msc_apache->modsec,
-            (Rules *)z->rules_set, (void *)r);
+            z->rules_set, (void *)r);
     }
 
     store_tx_context(msr, r);

src/mod_security3.h

@@ -3,7 +3,17 @@
 #include <ctype.h>
 
 #include <modsecurity/modsecurity.h>
+#if defined(MODSECURITY_CHECK_VERSION)
+#if MODSECURITY_VERSION_NUM >= 304010
+#define MSC_USE_RULES_SET 1
+#endif
+#endif
+
+#if defined(MSC_USE_RULES_SET)
+#include <modsecurity/rules_set.h>
+#else
 #include <modsecurity/rules.h>
+#endif
 #include <modsecurity/intervention.h>
 
 #include "apr_buckets.h"
@@ -46,7 +56,7 @@ typedef struct
 
 typedef struct
 {
-    Rules *rules_set;
+    void *rules_set;
     int msc_state;
     char *name_for_debug;
 } msc_conf_t;