From 5d7e726ba2c9c28d8be95345e963e5b467463aa6 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 29 Jun 2007 16:38:22 +0000
Subject: [PATCH] more interrogate changes

---
 dtool/pptempl/Global.pp         |  2 +-
 dtool/src/parser-inc/Sources.pp |  3 ++-
 dtool/src/parser-inc/malloc.h   | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 dtool/src/parser-inc/malloc.h

diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index f9d2626772..9e0f6ab11c 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -732,7 +732,7 @@ Warning: Variable $[upcase $[tree]]_INSTALL is not set!
 
 // Caution!  interrogate_ipath might be redefined in the
 // Global.platform.pp file.
-#defer interrogate_ipath -S/usr/include $[install_parser_inc_dir:%=-S%] $[target_ipath:%=-I%]
+#defer interrogate_ipath $[install_parser_inc_dir:%=-S%] $[target_ipath:%=-I%] -S/usr/include
 
 #defer interrogate_options \
     -DCPPPARSER -D__STDC__=1 -D__cplusplus $[SYSTEM_IGATE_FLAGS] \
diff --git a/dtool/src/parser-inc/Sources.pp b/dtool/src/parser-inc/Sources.pp
index a17663d422..4012eb3fda 100644
--- a/dtool/src/parser-inc/Sources.pp
+++ b/dtool/src/parser-inc/Sources.pp
@@ -15,6 +15,7 @@
     rtsp.h rtspcodes.h setjmp.h winsock2.h \
     ode/ode.h collision_trimesh.h  \
     netinet/tcp.h netinet/ip.h \
-    rfftw.h libtar.h
+    rfftw.h libtar.h malloc.h
+
 
 
diff --git a/dtool/src/parser-inc/malloc.h b/dtool/src/parser-inc/malloc.h
new file mode 100644
index 0000000000..16b3abbbb9
--- /dev/null
+++ b/dtool/src/parser-inc/malloc.h
@@ -0,0 +1,18 @@
+// Filename: malloc.h
+// Created by:  drose (28Jun07)
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001 - 2004, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://etc.cmu.edu/panda3d/docs/license/ .
+//
+// To contact the maintainers of this program write to
+// panda3d-general@lists.sourceforge.net .
+//
+////////////////////////////////////////////////////////////////////
+