From 531b737b6dac86fbc1c7f9b7353b88ff326e931f Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Tue, 31 Aug 2004 22:57:11 +0000 Subject: Don't re-declare hypot() on win32 as it will conflict with math.h as per http://bugzilla.remotesensing.org/show_bug.cgi?id=495 git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1220 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- src/projects.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/projects.h b/src/projects.h index d1b01083..c3a640de 100644 --- a/src/projects.h +++ b/src/projects.h @@ -28,6 +28,10 @@ ****************************************************************************** * * $Log$ + * Revision 1.19 2004/08/31 22:57:11 warmerda + * Don't re-declare hypot() on win32 as it will conflict with math.h as per + * http://bugzilla.remotesensing.org/show_bug.cgi?id=495 + * * Revision 1.18 2004/04/15 13:56:45 warmerda * changed PJD_ERR_GEOCENTRIC to -45 * @@ -116,7 +120,10 @@ extern "C" { #define MAX_PATH_FILENAME 1024 #endif /* prototype hypot for systems where absent */ +#ifndef _WIN32 extern double hypot(double, double); +#endif + /* some useful constants */ #define HALFPI 1.5707963267948966 #define FORTPI 0.78539816339744833 -- cgit v1.2.3