X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=a36412f097b98936b7461c2b4e824b2238182b67;hp=99d20131fd2cca2742eed7dc39288108a389a8a0;hb=c70eb596eeeeda21f872065d9e11a67996394626;hpb=75f16c2cce21659cd370b8d3090a6905cbdc6cca

diff --git a/include/ct.h b/include/ct.h
index 99d2013..a36412f 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.35 2000/11/28 15:37:52 kevin Exp $
+**  $Id: ct.h,v 1.53 2001/01/13 03:51:35 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,38 +28,68 @@
 #ifndef CT_H
 #define CT_H
 
-#ifdef _WIN32
-  extern "C" {int strcasecmp(const char*, const char*);}
-  typedef long off_t;
-  #define HAVE_STRING_H 1
-  #include <fcntl.h>
-  #define strcasecmp stricmp
-  #define strncasecmp strnicmp
+#define NO_MAIN 1    // filter out all old main blocks
+
+#ifdef MSVC
+#include "msvc_compat.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
   #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>
+
+#if defined(MSVC) || HAVE_SSTREAM
+#include <sstream>
+#else
+#include <sstream_subst>
+#endif
+
 #include <fstream>
 #include <iostream>
-#include <sstream>
 #include <string>
 #include <iterator>
 #include <algorithm>
 #include <exception>
 #include <stdexcept>
 #include <memory>
-#include <cstring>
-#include <cstddef>
-#include <cstdarg>
-#include <cstdlib>
 
-#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>
@@ -117,38 +147,12 @@ 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
-#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_FFTW
 #include <rfftw.h>
 #include <fftw.h>
+#define HAVE_FFT 1
 #endif
 
-using namespace std;
-
 #ifdef HAVE_MPI
 #include "mpi++.h"
 #include "mpiworld.h"
@@ -170,11 +174,14 @@ using namespace std;
 #include "scanner.h"
 #include "backprojectors.h"
 #include "filter.h"
+#include "fourier.h"
 #include "procsignal.h"
 #include "projections.h"
 #include "reconstruct.h"
+#include "plotfile.h"
 #include "trace.h"
 
+#include "ctglobals.h"
 
 #endif