On the trunk:

icing · icing · commit d7328a07d7d2 · 2018-01-29T11:40:25.000Z
core: adding defines to allow interworking with honggfuzz without further patches. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1822500 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) core: adding defines to allow interworking with honggfuzz without
+     further patches. [Stefan Eissing, Robert Swiecki]
+
   *) mod_slotmem_shm: Add generation number to shm filename to fix races
      with graceful restarts. PR 62044.
 
diff --git a/server/main.c b/server/main.c
@@ -484,7 +484,11 @@ static void usage(process_rec *process)
     destroy_and_exit_process(process, 1);
 }
 
-int main(int argc, const char * const argv[])
+#ifdef HFND_FUZZING_ENTRY_FUNCTION
+ HFND_FUZZING_ENTRY_FUNCTION(int argc, const char *const *argv)
+#else
+ int main(int argc, const char *const *argv)
+#endif
 {
     char c;
     int showcompile = 0, showdirectives = 0;

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,11 @@ static void usage(process_rec *process)`
`484`	`484`	`destroy_and_exit_process(process, 1);`
`485`	`485`	`}`
`486`	`486`
`487`		`-int main(int argc, const char * const argv[])`
	`487`	`+#ifdef HFND_FUZZING_ENTRY_FUNCTION`
	`488`	`+ HFND_FUZZING_ENTRY_FUNCTION(int argc, const char const argv)`
	`489`	`+#else`
	`490`	`+ int main(int argc, const char const argv)`
	`491`	`+#endif`
`488`	`492`	`{`
`489`	`493`	`char c;`
`490`	`494`	`int showcompile = 0, showdirectives = 0;`