Update of /cvsroot/simspark/simspark/spark/oxygen/physicsserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11518
Modified Files:
Tag: WIN32
odewrapper.h
Log Message:
- add gpl header
- fix include guard
- mute compiler warnings about redefined macros
Index: odewrapper.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/physicsserver/Attic/odewrapper.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** odewrapper.h 13 Feb 2007 19:52:34 -0000 1.1.2.1
--- odewrapper.h 13 Feb 2007 20:02:14 -0000 1.1.2.2
***************
*** 1,4 ****
! #ifndef ODEWRAPPER_H
! #define ODEWRAPPER_H
#undef PACKAGE
--- 1,25 ----
! /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*-
!
! this file is part of rcssserver3D
! Fri May 9 2003
! Copyright (C) 2002,2003 Koblenz University
! Copyright (C) 2003 RoboCup Soccer Server 3D Maintenance Group
! $Id$
!
! This program is free software; you can redistribute it and/or modify
! it under the terms of the GNU General Public License as published by
! the Free Software Foundation; version 2 of the License.
!
! This program is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! GNU General Public License for more details.
!
! You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! */
! #ifndef OXYGEN_ODEWRAPPER_H
! #define OXYGEN_ODEWRAPPER_H
#undef PACKAGE
***************
*** 10,13 ****
--- 31,46 ----
#undef PACKAGE_BUGREPORT
+ #ifdef WIN32
+
+ #ifdef copysignf
+ #undef copysignf
+ #endif
+
+ #ifdef copysign
+ #undef copysign
+ #endif
+
+ #endif // WIN32
+
#include <ode/ode.h>
***************
*** 20,24 ****
#undef PACKAGE_BUGREPORT
#include <config.h>
-
#endif
--- 53,59 ----
#undef PACKAGE_BUGREPORT
+ #ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+
+ #endif // OXYGEN_ODEWRAPPER
|
