From aa60d44d6d7483da2b2b9804a61a6650b6e33ae5 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 12 Feb 2007 18:47:47 +0000
Subject: [PATCH] build on Linux

---
 panda/src/ode/odeContactGeom.h   | 2 +-
 panda/src/ode/odeSpace.h         | 4 ++--
 panda/src/ode/odeTriMeshData.I   | 2 +-
 panda/src/ode/odeTriMeshData.cxx | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/panda/src/ode/odeContactGeom.h b/panda/src/ode/odeContactGeom.h
index d4c70bf9e5..36518c50c9 100755
--- a/panda/src/ode/odeContactGeom.h
+++ b/panda/src/ode/odeContactGeom.h
@@ -24,7 +24,7 @@
 #include "luse.h"
 
 #include "ode_includes.h"
-#include "OdeGeom.h"
+#include "odeGeom.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : OdeContactGeom
diff --git a/panda/src/ode/odeSpace.h b/panda/src/ode/odeSpace.h
index 1d3268a609..5807a48821 100755
--- a/panda/src/ode/odeSpace.h
+++ b/panda/src/ode/odeSpace.h
@@ -48,8 +48,8 @@ PUBLISHED:
 
   INLINE void set_cleanup(int mode);
   INLINE int get_cleanup() const;
-  INLINE int query(const OdeGeom& geom) const;
-  INLINE int query(const OdeSpace& space) const;
+  int query(const OdeGeom& geom) const;
+  int query(const OdeSpace& space) const;
   INLINE int get_num_geoms() const;
   INLINE void get_AABB(LVecBase3f &min, LVecBase3f &max) const;
   INLINE int is_space();
diff --git a/panda/src/ode/odeTriMeshData.I b/panda/src/ode/odeTriMeshData.I
index ad87d4a1d7..59d7158209 100755
--- a/panda/src/ode/odeTriMeshData.I
+++ b/panda/src/ode/odeTriMeshData.I
@@ -85,4 +85,4 @@ update() {
   dGeomTriMeshDataUpdate(_id);
 }
 
-*/
\ No newline at end of file
+*/
diff --git a/panda/src/ode/odeTriMeshData.cxx b/panda/src/ode/odeTriMeshData.cxx
index 39a638c208..69bc086d59 100755
--- a/panda/src/ode/odeTriMeshData.cxx
+++ b/panda/src/ode/odeTriMeshData.cxx
@@ -74,9 +74,9 @@ OdeTriMeshData(const NodePath& model, bool use_normals) :
   _id(dGeomTriMeshDataCreate()),
   _vertices(0),
   _faces(0),
+  _normals(false),
   _num_vertices(0),
-  _num_faces(0),
-  _normals(false) {
+  _num_faces(0) {
   odetrimeshdata_cat.debug() << get_type() << "(" << _id << ")" << "\n";
   
   process_model(model, use_normals);