Borland portability tweaks.
This commit is contained in:
parent
1690f5475d
commit
d7748704d7
3 changed files with 15 additions and 5 deletions
|
@ -11,7 +11,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
# ifndef HAVE_STL_SGI_PORT
|
||||||
# include <memory.h> /* required for memset() and memcpy() */
|
# include <memory.h> /* required for memset() and memcpy() */
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
@ -33,8 +33,11 @@
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <math.h>
|
#if defined( __BORLANDC__ )
|
||||||
|
# define exception c_exception
|
||||||
|
#elif defined( __FreeBSD__ )
|
||||||
|
# include <math.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
const double fgPoint3_Epsilon = 0.0000001;
|
const double fgPoint3_Epsilon = 0.0000001;
|
||||||
|
|
||||||
|
@ -295,6 +298,9 @@ Point3D::distance3D(const Point3D& a ) const
|
||||||
|
|
||||||
|
|
||||||
// $Log$
|
// $Log$
|
||||||
|
// Revision 1.6 1998/11/23 21:46:37 curt
|
||||||
|
// Borland portability tweaks.
|
||||||
|
//
|
||||||
// Revision 1.5 1998/11/20 01:00:38 curt
|
// Revision 1.5 1998/11/20 01:00:38 curt
|
||||||
// Patch in fgGeoc2Geod() to avoid a floating explosion.
|
// Patch in fgGeoc2Geod() to avoid a floating explosion.
|
||||||
// point3d.hxx include math.h for FreeBSD
|
// point3d.hxx include math.h for FreeBSD
|
||||||
|
|
|
@ -5,16 +5,18 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#if !defined( __CYGWIN__ ) && !defined( __CYGWIN32__ )
|
#if !defined( __CYGWIN__ ) && !defined( __CYGWIN32__ )
|
||||||
|
# if !defined( HAVE_STL_SGI_PORT ) // Avoid malloc with STLport
|
||||||
# include <malloc.h>
|
# include <malloc.h>
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "xgl.h"
|
#include "xgl.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue