r318: *** empty log message ***

[ctsim.git] / include / ctsupport.h

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 617554362cfffb3e78f9b65d7f7430a9cc3a988a..9a9ca835303e465999a1d1f3534f141c18cdb1e6 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.12 2000/12/16 03:29:02 kevin Exp $
+**  $Id: ctsupport.h,v 1.18 2000/12/29 15:45:06 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #endif
 
 #ifdef MSVC
-#define snprintf _snprintf
+#include "msvc_compat.h"
 #endif
 
 #define STR_MAX_LEN 255
@@ -44,6 +44,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdarg>
+#include <vector>\r
+#include <algorithm>\r
 
 #define TRUE   1
 #define FALSE  0
@@ -62,6 +64,7 @@
 
 /*----------------------------------------------------------------------*/
 
+#define ERR_TRACE -1\r
 #define ERR_WARNING    0
 #define ERR_SEVERE     1
 #define ERR_FATAL      2
@@ -82,7 +85,7 @@
 
 /*----------------------------------------------------------------------*/
 
-#ifndef O_BINARY
+#if !defined(O_BINARY) && !defined(MSVC)
 #define O_BINARY (0)
 #endif
 
@@ -145,7 +148,7 @@ char *str_upper(char *str);
 
 /* syserror.cpp */
 void sys_error(int severity, const char *msg, ...);
-void sys_verror(int severity, const char *msg, va_list arg);
+void sys_verror (std::string& strOutput, int severity, const char *msg, va_list arg);
 void sys_error_level(int severity);
 
 // Math Section
@@ -234,6 +237,7 @@ void scale2d (double x[], double y[], int pts, double xfact, double yfact);
 // mathfuncs.cpp
 double normalizeAngle (double theta);
 double integrateSimpson (const double xmin, const double xmax, const double *y, const int np);
+void vectorNumericStatistics (std::vector<double> vec, const int nPoints, double& min, double& max, double& mean, double& mode, double& median, double& stddev);\r
 
 
 /*----------------------------------------------------------------------*/