From f78de74b202cefa087e9d6d1ac62a6d4f0bcf6eb Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Thu, 26 Dec 2002 18:25:17 +0000 Subject: WooHoo me again ;) I took out the following from the includes in the intern dir that still had it: -#ifdef HAVE_CONFIG_H -#include -#endif Kent -- mein@cs.umn.edu --- intern/bsp/extern/CSG_BooleanOps.h | 5 ----- intern/bsp/intern/BSP_CSGException.h | 5 ----- intern/bsp/intern/BSP_CSGHelper.h | 6 ------ intern/bsp/intern/BSP_CSGISplitter.h | 6 ------ intern/bsp/intern/BSP_CSGMesh.h | 6 ------ intern/bsp/intern/BSP_CSGMeshBuilder.h | 6 ------ intern/bsp/intern/BSP_CSGMeshSplitter.h | 6 ------ intern/bsp/intern/BSP_CSGMesh_CFIterator.h | 6 ------ intern/bsp/intern/BSP_CSGNCMeshSplitter.h | 6 ------ intern/bsp/intern/BSP_CSGUserData.h | 6 ------ intern/bsp/intern/BSP_FragNode.h | 6 ------ intern/bsp/intern/BSP_FragTree.h | 6 ------ intern/bsp/intern/BSP_MeshFragment.h | 7 ------- intern/bsp/intern/BSP_MeshPrimitives.h | 6 ------ intern/bsp/intern/BSP_Triangulate.h | 6 ------ intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h | 7 ------- intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h | 8 -------- intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h | 6 ------ intern/bsp/test/BSP_GhostTest/BSP_TMesh.h | 6 ------ intern/bsp/test/BSP_GhostTest/ply.h | 4 ---- 20 files changed, 120 deletions(-) (limited to 'intern/bsp') diff --git a/intern/bsp/extern/CSG_BooleanOps.h b/intern/bsp/extern/CSG_BooleanOps.h index c7f854ff5d7..418b81a62b3 100755 --- a/intern/bsp/extern/CSG_BooleanOps.h +++ b/intern/bsp/extern/CSG_BooleanOps.h @@ -30,13 +30,8 @@ */ #ifndef CSG_BOOLEANOPS_H - #define CSG_BOOLEANOPS_H -#ifdef HAVE_CONFIG_H -#include -#endif - /** * @section Interface structures for CSG module. diff --git a/intern/bsp/intern/BSP_CSGException.h b/intern/bsp/intern/BSP_CSGException.h index bfac6fd346e..c2d79630be2 100755 --- a/intern/bsp/intern/BSP_CSGException.h +++ b/intern/bsp/intern/BSP_CSGException.h @@ -30,13 +30,8 @@ */ #ifndef NAN_INCLUDED_CSGException_h - #define NAN_INCLUDED_CSGException_h -#ifdef HAVE_CONFIG_H -#include -#endif - // stick in more error types as you think of them enum BSP_ExceptionType{ diff --git a/intern/bsp/intern/BSP_CSGHelper.h b/intern/bsp/intern/BSP_CSGHelper.h index e27de3687a4..b6b88422358 100644 --- a/intern/bsp/intern/BSP_CSGHelper.h +++ b/intern/bsp/intern/BSP_CSGHelper.h @@ -30,14 +30,8 @@ */ #ifndef BSP_CSGHELPER_H - #define BSP_CSGHELPER_H -#ifdef HAVE_CONFIG_H -#include -#endif - - class BSP_CSGMesh; class BSP_MeshFragment; diff --git a/intern/bsp/intern/BSP_CSGISplitter.h b/intern/bsp/intern/BSP_CSGISplitter.h index 826b2c0d477..17392fd07be 100755 --- a/intern/bsp/intern/BSP_CSGISplitter.h +++ b/intern/bsp/intern/BSP_CSGISplitter.h @@ -30,14 +30,8 @@ */ #ifndef BSP_CSGISplitter_h - #define BSP_CSGISplitter_h -#ifdef HAVE_CONFIG_H -#include -#endif - - class BSP_MeshFragment; class BSP_CSGMesh; diff --git a/intern/bsp/intern/BSP_CSGMesh.h b/intern/bsp/intern/BSP_CSGMesh.h index 4b634f3aa50..28a27ce70d2 100755 --- a/intern/bsp/intern/BSP_CSGMesh.h +++ b/intern/bsp/intern/BSP_CSGMesh.h @@ -30,14 +30,8 @@ */ #ifndef NAN_INCLUDED_BSP_CSGMesh_h - #define NAN_INCLUDED_BSP_CSGMesh_h -#ifdef HAVE_CONFIG_H -#include -#endif - - #include "BSP_MeshPrimitives.h" #include "MEM_SmartPtr.h" #include "MEM_RefCountPtr.h" diff --git a/intern/bsp/intern/BSP_CSGMeshBuilder.h b/intern/bsp/intern/BSP_CSGMeshBuilder.h index c6763f11755..8216f972c74 100755 --- a/intern/bsp/intern/BSP_CSGMeshBuilder.h +++ b/intern/bsp/intern/BSP_CSGMeshBuilder.h @@ -30,14 +30,8 @@ */ #ifndef BSP_CSGMeshBuilder_h - #define BSP_CSGMeshBuilder_h -#ifdef HAVE_CONFIG_H -#include -#endif - - #include "../extern/CSG_BooleanOps.h" #include "BSP_CSGMesh.h" #include "MEM_NonCopyable.h" diff --git a/intern/bsp/intern/BSP_CSGMeshSplitter.h b/intern/bsp/intern/BSP_CSGMeshSplitter.h index 141c498b909..44aa4ad949a 100755 --- a/intern/bsp/intern/BSP_CSGMeshSplitter.h +++ b/intern/bsp/intern/BSP_CSGMeshSplitter.h @@ -30,14 +30,8 @@ */ #ifndef BSP_CSGMeshSplitter_h - #define BSP_CSGMeshSplitter_h -#ifdef HAVE_CONFIG_H -#include -#endif - - class BSP_MeshFragment; class MT_Plane3; class BSP_CSGMesh; diff --git a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h index 5fb6d794e7a..8255b4f7d2a 100755 --- a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h +++ b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h @@ -30,14 +30,8 @@ */ #ifndef BSP_CSGMesh_CFIterator_h - #define BSP_CSGMesh_CFIterator_h -#ifdef HAVE_CONFIG_H -#include -#endif - - #include "BSP_CSGMesh.h" #include "../extern/CSG_BooleanOps.h" /** diff --git a/intern/bsp/intern/BSP_CSGNCMeshSplitter.h b/intern/bsp/intern/BSP_CSGNCMeshSplitter.h index 1fcfbcac981..407a4c8b46f 100755 --- a/intern/bsp/intern/BSP_CSGNCMeshSplitter.h +++ b/intern/bsp/intern/BSP_CSGNCMeshSplitter.h @@ -30,14 +30,8 @@ */ #ifndef BSP_CSGNCMeshSplitter_h - #define BSP_CSGNCMeshSplitter_h -#ifdef HAVE_CONFIG_H -#include -#endif - - class BSP_MeshFragment; class MT_Plane3; class BSP_CSGMesh; diff --git a/intern/bsp/intern/BSP_CSGUserData.h b/intern/bsp/intern/BSP_CSGUserData.h index 1b3676992d5..8b008b83845 100755 --- a/intern/bsp/intern/BSP_CSGUserData.h +++ b/intern/bsp/intern/BSP_CSGUserData.h @@ -30,14 +30,8 @@ */ #ifndef BSP_CSGUserData_h - #define BSP_CSGUserData_h -#ifdef HAVE_CONFIG_H -#include -#endif - - #include /** diff --git a/intern/bsp/intern/BSP_FragNode.h b/intern/bsp/intern/BSP_FragNode.h index 7a674269b27..ed4b6a9f609 100755 --- a/intern/bsp/intern/BSP_FragNode.h +++ b/intern/bsp/intern/BSP_FragNode.h @@ -30,14 +30,8 @@ */ #ifndef BSP_FragNode_h - #define BSP_FragNode_h -#ifdef HAVE_CONFIG_H -#include -#endif - - #include "BSP_FragTree.h" #include "BSP_MeshFragment.h" #include "MT_Plane3.h" diff --git a/intern/bsp/intern/BSP_FragTree.h b/intern/bsp/intern/BSP_FragTree.h index 02fb7a8e66e..caf7234d739 100755 --- a/intern/bsp/intern/BSP_FragTree.h +++ b/intern/bsp/intern/BSP_FragTree.h @@ -30,14 +30,8 @@ */ #ifndef BSP_FragTree_h - #define BSP_FragTree_h -#ifdef HAVE_CONFIG_H -#include -#endif - - class BSP_FragNode; #include "MEM_SmartPtr.h" diff --git a/intern/bsp/intern/BSP_MeshFragment.h b/intern/bsp/intern/BSP_MeshFragment.h index ac1c21a338d..8ed3b9010e4 100755 --- a/intern/bsp/intern/BSP_MeshFragment.h +++ b/intern/bsp/intern/BSP_MeshFragment.h @@ -30,18 +30,11 @@ */ #ifndef NAN_INCLUDED_BSP_MeshFragment_h - #define NAN_INCLUDED_BSP_MeshFragment_h - #define BSP_SPLIT_EPSILON MT_Scalar(1e-5) #include - -#ifdef HAVE_CONFIG_H -#include -#endif - #include "BSP_MeshPrimitives.h" diff --git a/intern/bsp/intern/BSP_MeshPrimitives.h b/intern/bsp/intern/BSP_MeshPrimitives.h index f3adfcffdc2..adfdb57e5f5 100644 --- a/intern/bsp/intern/BSP_MeshPrimitives.h +++ b/intern/bsp/intern/BSP_MeshPrimitives.h @@ -30,14 +30,8 @@ */ #ifndef NAN_INCLUDED_BSP_MeshPrimitives - #define NAN_INCLUDED_BSP_MeshPrimitives -#ifdef HAVE_CONFIG_H -#include -#endif - - #include "CTR_TaggedIndex.h" #include "MT_Vector3.h" #include "MT_Plane3.h" diff --git a/intern/bsp/intern/BSP_Triangulate.h b/intern/bsp/intern/BSP_Triangulate.h index 44a2b8c960a..858be88419c 100755 --- a/intern/bsp/intern/BSP_Triangulate.h +++ b/intern/bsp/intern/BSP_Triangulate.h @@ -49,13 +49,7 @@ /** whatever your own Vector implementation might be. **/ /*****************************************************************/ - #include // Include STL vector class. - -#ifdef HAVE_CONFIG_H -#include -#endif - #include "MT_Point3.h" #include "BSP_MeshPrimitives.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h index 05da968c69c..042c73174a6 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.h @@ -30,15 +30,8 @@ */ #ifndef BSP_GhostTest_h - #define BSP_GhostTest_h -#ifdef HAVE_CONFIG_H -#include -#endif - - - #include "GHOST_IEventConsumer.h" #include "MT_Vector3.h" #include "BSP_TMesh.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h index f89462395bb..314b9691137 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.h @@ -30,16 +30,8 @@ */ #ifndef BSP_MeshDrawer_h - #define BSP_MeshDrawer_h -#ifdef HAVE_CONFIG_H -#include -#endif - - - - class BSP_TMesh; class MT_Vector3; diff --git a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h index 4a4b12fb8be..d2e9b8cd2cc 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.h @@ -30,14 +30,8 @@ */ #ifndef BSP_PlyLoader_h - #define BSP_PlyLoader_h -#ifdef HAVE_CONFIG_H -#include -#endif - - #include "MEM_SmartPtr.h" #include "BSP_TMesh.h" diff --git a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h index 8b8a365ff78..4322fedbed4 100755 --- a/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h +++ b/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h @@ -30,14 +30,8 @@ */ #ifndef BSP_TMesh_h - #define BSP_TMesh_h -#ifdef HAVE_CONFIG_H -#include -#endif - - #include "MT_Point3.h" #include "MT_Vector3.h" #include "MT_Transform.h" diff --git a/intern/bsp/test/BSP_GhostTest/ply.h b/intern/bsp/test/BSP_GhostTest/ply.h index 04844069971..7947d224c5f 100755 --- a/intern/bsp/test/BSP_GhostTest/ply.h +++ b/intern/bsp/test/BSP_GhostTest/ply.h @@ -71,10 +71,6 @@ extern "C" { #include #include -#ifdef HAVE_CONFIG_H -#include -#endif - #define PLY_ASCII 1 /* ascii PLY file */ #define PLY_BINARY_BE 2 /* binary PLY file, big endian */ #define PLY_BINARY_LE 3 /* binary PLY file, little endian */ -- cgit v1.2.3