X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fct.h;h=8750cab54e24cc192f5342d24e99c45fba7f704b;hb=ff9c2e8f6e126acbef08e0dfccc6ea112b44ca41;hp=0653809af675d855e9fe4744de7b7074216d53b9;hpb=bfcc769cf8019eabc8c65c07257c8dbee4b4c977;p=ctsim.git

diff --git a/include/ct.h b/include/ct.h
index 0653809..8750cab 100644
--- a/include/ct.h
+++ b/include/ct.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ct.h,v 1.32 2000/09/02 05:10:39 kevin Exp $
+**  $Id: ct.h,v 1.34 2000/11/28 14:54:07 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -33,8 +33,6 @@
   typedef long off_t;
   #define HAVE_STRING_H 1
   #include <fcntl.h>
-  #define snprintf _snprintf
-  #define vsnprintf _vsnprintf
   #define strcasecmp stricmp
   #define strncasecmp strnicmp
 #endif
@@ -42,9 +40,29 @@
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif
+
+#include <cmath>
+#include <complex>
+#include <cstdio>
+#include <cctype>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <exception>
+#include <stdexcept>
+#include <memory>
+
+#define __MATH_H__ 1
+
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #ifdef HAVE_PNG
   #include "png.h"
 #endif
@@ -58,9 +76,7 @@ extern "C" {
 }
 #endif
 #endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -79,12 +95,6 @@ extern "C" {
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
@@ -94,9 +104,6 @@ extern "C" {
 #if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
 #include <getopt.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>
 #endif
@@ -116,22 +123,24 @@ extern "C" {
 #include <assert.h>
 #endif
 
+
+#if 0
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#endif
+
 #ifdef HAVE_FFTW
 #include <rfftw.h>
 #include <fftw.h>
 #endif
 
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <iterator>
-#include <algorithm>
-#include <exception>
-#include <stdexcept>
-#include <memory>
-#include <complex>
-
 using namespace std;
 
 #ifdef HAVE_MPI