summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/command.h5
-rw-r--r--lib/bzlib_private.h11
2 files changed, 2 insertions, 14 deletions
diff --git a/include/command.h b/include/command.h
index 3aca1a9f1b..b938431f05 100644
--- a/include/command.h
+++ b/include/command.h
@@ -25,10 +25,7 @@
#include <linux/list.h>
#include <linux/stringify.h>
-
-#ifndef NULL
-#define NULL 0
-#endif
+#include <linux/stddef.h>
#ifndef __ASSEMBLY__
diff --git a/lib/bzlib_private.h b/lib/bzlib_private.h
index 87d8f94525..de10dd4215 100644
--- a/lib/bzlib_private.h
+++ b/lib/bzlib_private.h
@@ -67,6 +67,7 @@
#define _BZLIB_PRIVATE_H
#include <malloc.h>
+#include <linux/stddef.h>
#include "bzlib.h"
@@ -515,16 +516,6 @@ BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
#endif
-
-/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
-
-#ifdef BZ_NO_STDIO
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
-
-
/*-------------------------------------------------------------*/
/*--- end bzlib_private.h ---*/
/*-------------------------------------------------------------*/