From 028a68f0eba1d321594f48a5f4bb3ff3966e56cb Mon Sep 17 00:00:00 2001
From: kseitz <kseitz>
Date: Wed, 23 Apr 2008 18:09:41 +0000
Subject: [PATCH]         Based on patch from Masaki Muranaka 
 <monaka@monami-software.com>:         * compat/strstr.c: Include tcl.h and
 define NULL if it is         not already defined.

---
 tcl/ChangeLog       | 6 ++++++
 tcl/compat/strstr.c | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/tcl/ChangeLog b/tcl/ChangeLog
index 920a0d1a9e..42b0ca88fd 100644
--- a/tcl/ChangeLog
+++ b/tcl/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-23  Keith Seitz  <keiths@redhat.com>
+
+	Based on patch from Masaki Muranaka  <monaka@monami-software.com>:
+	* compat/strstr.c: Include tcl.h and define NULL if it is
+	not already defined.
+
 2008-03-03  Keith Seitz  <keiths@redhat.com>
 
 	From Dave Murphy  <davem@devkitpro.org>:
diff --git a/tcl/compat/strstr.c b/tcl/compat/strstr.c
index 68b6bfbadd..dd8e23e38d 100644
--- a/tcl/compat/strstr.c
+++ b/tcl/compat/strstr.c
@@ -12,6 +12,11 @@
  * RCS: @(#) $Id$
  */
 
+#include "tcl.h"
+#ifndef NULL
+#define NULL 0
+#endif
+
 /*
  *----------------------------------------------------------------------
  *
-- 
2.11.0