From 553b5b77d3a1d8c98b97e666d6526e8688e29a52 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Mon, 30 Jul 2007 09:51:03 +0000
Subject: malloc.h -> stdlib.h

---
 graphics/vtk/distinfo         |  3 ++-
 graphics/vtk/patches/patch-ag | 46 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 graphics/vtk/patches/patch-ag

(limited to 'graphics/vtk')

diff --git a/graphics/vtk/distinfo b/graphics/vtk/distinfo
index 08dffe13759..5ce61aa277a 100644
--- a/graphics/vtk/distinfo
+++ b/graphics/vtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/06/18 19:15:23 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/07/30 09:51:03 joerg Exp $
 
 SHA1 (VTK-4.2.6/VTK-4.2-LatestRelease.tar.gz) = 31ab01c16b3d44ce201d8180af431833cf6527d8
 RMD160 (VTK-4.2.6/VTK-4.2-LatestRelease.tar.gz) = 71a092cf929cfaeeb8f297334cadb829209b9ad7
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = 59977568e92ba01344447c0c0b1c770d26e460bb
 SHA1 (patch-ad) = efc49225d42953bb2fd0e099130e415a78b5b522
 SHA1 (patch-ae) = 1860d6e31bda808aed6340a8493c5e5d17eeef2f
 SHA1 (patch-af) = bdac3992a39dc19b4a231f02cc3eae4cd4b1f403
+SHA1 (patch-ag) = ab904d1c464f2873460b41ab4c78bf0fe70d36d1
diff --git a/graphics/vtk/patches/patch-ag b/graphics/vtk/patches/patch-ag
new file mode 100644
index 00000000000..7d8e9ca12b9
--- /dev/null
+++ b/graphics/vtk/patches/patch-ag
@@ -0,0 +1,46 @@
+$NetBSD: patch-ag,v 1.1 2007/07/30 09:51:03 joerg Exp $
+
+--- Hybrid/vtkVRMLImporter.cxx.orig	2007-07-30 08:46:08.000000000 +0000
++++ Hybrid/vtkVRMLImporter.cxx
+@@ -59,6 +59,8 @@
+ #include "vtkTransform.h"
+ #include "vtkVRML.h"
+ 
++#include <stdlib.h>
++
+ #ifdef WIN32
+ #pragma warning( disable : 4005 )
+ #endif
+@@ -491,10 +493,6 @@ VrmlNodeType::has(const vtkVRMLVectorTyp
+ 
+ #define YYDEBUG 1
+ 
+-#ifndef __APPLE__
+-#include <malloc.h>
+-#endif
+-
+ #ifdef USE_STD_NAMESPACE
+ using namespace std;
+ #endif
+@@ -4174,21 +4172,6 @@ int yywrap() { BEGIN INITIAL; return 1; 
+  * section 1.
+  */
+ 
+-#ifdef YY_MALLOC_DECL
+-YY_MALLOC_DECL
+-#else
+-#if __STDC__
+-#ifndef __cplusplus
+-#include <stdlib.h>
+-#endif
+-#else
+-/* Just try to get by without declaring the routines.  This will fail
+- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
+- * or sizeof(void*) != sizeof(int).
+- */
+-#endif
+-#endif
+-
+ /* Amount of stuff to slurp up with each read. */
+ #ifndef YY_READ_BUF_SIZE
+ #define YY_READ_BUF_SIZE 8192
-- 
cgit v1.2.3