Changes to work with upstream CPython

guidovranken · guidovranken · commit 6d6688fb4fb1 · 2019-07-03T16:23:02.000+02:00
diff --git a/fuzzer.cpp b/fuzzer.cpp
@@ -8,8 +8,6 @@
 #include <optional>
 #include <Python.h>
 
-#include "python_coverage.h"
-
 #ifndef PYTHON_HARNESS_PATH
 #error "Define PYTHON_HARNESS_PATH"
 #endif
diff --git a/python_coverage.h b/python_coverage.h
@@ -1,13 +1,13 @@
 #pragma once
+#include <stdint.h>
+#include <stddef.h>
 
 #define COVERAGE_ARRAY_SIZE 65536
 
-extern "C" {
-    __attribute__((section("__libfuzzer_extra_counters")))
-    uint8_t coverage_counter[COVERAGE_ARRAY_SIZE];
-}
+__attribute__((section("__libfuzzer_extra_counters")))
+uint8_t coverage_counter[COVERAGE_ARRAY_SIZE];
 
-extern "C" void global_record_code_coverage(void* codeptr, int lasti)
+void fuzzer_record_code_coverage(void* codeptr, int lasti)
 {
     coverage_counter[ ((size_t)(codeptr) ^ (size_t)(lasti)) % COVERAGE_ARRAY_SIZE ] = 1;
 }
