From 1a24391866da99f5bd929e0a904739918e3bdbb5 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 18 Feb 2002 06:08:23 +0000
Subject: [PATCH] Remove now-obsolete __STDC__ ifdefs, remove redundant NULL
 definition and include stdlib.h for NULL.

---
 bin/sh/mkbuiltins |  1 +
 bin/sh/output.h   |  4 ----
 bin/sh/shell.h    | 10 ----------
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index e53f2b3d569e..e4beb76b2f2a 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -54,6 +54,7 @@ cat <<\!
  * This file was generated by the mkbuiltins program.
  */
 
+#include <stdlib.h>
 #include "shell.h"
 #include "builtins.h"
 
diff --git a/bin/sh/output.h b/bin/sh/output.h
index 5991115ee9c0..e525a626b77c 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -39,11 +39,7 @@
 
 #ifndef OUTPUT_INCL
 
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 struct output {
 	char *nextc;
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 0d00a91c0816..07c0ec512f67 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -57,17 +57,7 @@
 #endif
 /* #define DEBUG 1 */
 
-#ifdef __STDC__
 typedef void *pointer;
-#ifndef NULL
-#define NULL (void *)0
-#endif
-#else /* not __STDC__ */
-typedef char *pointer;
-#ifndef NULL
-#define NULL 0
-#endif
-#endif /*  not __STDC__ */
 #define STATIC  static
 #define MKINIT	/* empty */