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

diff --git a/include/ct.h b/include/ct.h
index 8750cab..0928b91 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.34 2000/11/28 14:54:07 kevin Exp $
+**  $Id: ct.h,v 1.41 2000/12/04 05:36:57 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
@@ -28,7 +28,7 @@
 #ifndef CT_H
 #define CT_H
 
-#ifdef _WIN32
+#ifdef MSVC
   extern "C" {int strcasecmp(const char*, const char*);}
   typedef long off_t;
   #define HAVE_STRING_H 1
@@ -41,13 +41,21 @@
   #include <config.h>
 #endif
 
-#include <cmath>
+#define HAVE_ANSI_CPP 1
+#ifdef HAVE_ANSI_CPP
 #include <complex>
+#include <cmath>
 #include <cstdio>
 #include <cctype>
+#include <cstring>
+#include <cstddef>
+#include <cstdarg>
+#include <cstdlib>
+using namespace std;
+
+#include <sstream>
 #include <fstream>
 #include <iostream>
-#include <sstream>
 #include <string>
 #include <iterator>
 #include <algorithm>
@@ -55,7 +63,32 @@
 #include <stdexcept>
 #include <memory>
 
-#define __MATH_H__ 1
+#else
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#endif
+
 
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>
@@ -77,18 +110,7 @@ extern "C" {
 #endif
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
+
 #ifdef  HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -124,25 +146,11 @@ extern "C" {
 #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
 
-using namespace std;
-
 #ifdef HAVE_MPI
 #include "mpi++.h"
 #include "mpiworld.h"