fixincludes was changing the definition of
NULL on OpenBSD from
#ifndef NULL
#ifdef __GNUG__
#define NULL __null
#else
#define NULL ((void *)0)
#endif
#endif
to
#ifndef NULL
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0
#endif
#endif
Posting the proposed fix from Mike in PR 48851 here as asked
as he doesn't have the environment to regenerate fixincl.x
2011-10-23 Mike Stump <mikest...@comcast.net>
* inclhack.def (void_null): New bypass.
* fixincl.x: Regenerate.
Index: inclhack.def
===================================================================
--- inclhack.def (revision 180322)
+++ inclhack.def (working copy)
@@ -4585,6 +4585,7 @@
files = sys/types.h;
/* avoid changing C++ friendly NULL */
bypass = __cplusplus;
+ bypass = __null;
select = "^#[ \t]*define[ \t]+NULL[ \t]+\\(\\(void[ \t]*\\*\\)0\\)";
c_fix = format;
c_fix_arg = "#define NULL 0";
Index: fixincl.x
===================================================================
--- fixincl.x (revision 180322)
+++ fixincl.x (working copy)
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed September 22, 2011 at 04:28:52 PM by AutoGen 5.11.1
+ * It has been AutoGen-ed Sunday October 23, 2011 at 12:18:29 PM EST
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Sep 22 16:28:52 CEST 2011
+/* DO NOT SVN-MERGE THIS FILE, EITHER Sun Oct 23 12:18:29 EST 2011
*
* You must regenerate it. Use the ./genfixes script.
*
@@ -8587,10 +8587,13 @@
*/
tSCC zVoid_NullBypass0[] =
"__cplusplus";
+tSCC zVoid_NullBypass1[] =
+ "__null";
-#define VOID_NULL_TEST_CT 2
+#define VOID_NULL_TEST_CT 3
static tTestDesc aVoid_NullTests[] = {
{ TT_NEGREP, zVoid_NullBypass0, (regex_t*)NULL },
+ { TT_NEGREP, zVoid_NullBypass1, (regex_t*)NULL },
{ TT_EGREP, zVoid_NullSelect0, (regex_t*)NULL }, };
/*
@@ -8953,7 +8956,7 @@
*
* List of all fixes
*/
-#define REGEX_COUNT 261
+#define REGEX_COUNT 262
#define MACH_LIST_SIZE_LIMIT 181
#define FIX_COUNT 220
