r246: More modifications for MSVC

[ctsim.git] / include / ctsupport.h

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 5558150baaa25674f6d85079964cb1b770f7e008..60a6c2c40adb2fd6acc476895b2aae76e6b48abb 100644 (file)
--- a/include/ctsupport.h
+++ b/include/ctsupport.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsupport.h,v 1.6 2000/07/29 19:50:08 kevin Exp $
+**  $Id: ctsupport.h,v 1.8 2000/12/06 01:46:43 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -191,7 +191,7 @@ char *td_day_name(int n);
 
 // Math Section
 
-#include <math.h>
+#include <cmath>
 
 #define PI      3.14159265358979323846
 #define HALFPI  1.57079632679489661923 /* PI divided by 2 */
@@ -222,6 +222,9 @@ template<class T>
 inline T nearest (double x)
 { return (x > 0 ? static_cast<T>(x+0.5) : static_cast<T>(x-0.5)); }
 
+inline int imax (int a, int b)\r
+{ return (a >= b ? a : b); }\r
+\r
 template<class T>
 inline T clamp (T value, T lowerBounds, T upperBounds)
 { return (value >= upperBounds ? upperBounds : (value <= lowerBounds ? lowerBounds : value )); }
@@ -248,7 +251,7 @@ inline void minmax_array (const T* array, const int n, T& min, T& max)
 //////////////////////////////////////////////////////////////
 
 // clip.cpp 
-int clip_rect (double& x1, double& y1, double& x2, double& y2, const double rect[4]);
+bool clip_rect (double& x1, double& y1, double& x2, double& y2, const double rect[4]);
 int clip_segment (double& x1, double& y1, double& x2, double& y2, const double u, const double v);
 int clip_sector (double& x1, double& y1, double& x2, double& y2, const double u, const double v);
 int clip_circle (double& x1, double& y1, double& x2, double& y2, const double cx, const double cy, const double radius, double t1, double t2);