X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=b618130ec6d152772bd23b2baece82a430727e8c;hp=2cc4b554f0ef39ca070cd159eacf0281870b5645;hb=9b2bb510160bdb56f04847f5b55ab61dd8a47976;hpb=d158a6da6ec776fe98961f73f2ea74cf55de4700

diff --git a/include/ct.h b/include/ct.h
index 2cc4b55..b618130 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.30 2000/08/03 09:57:33 kevin Exp $
+**  $Id: ct.h,v 1.48 2001/01/02 05:34: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,35 +28,47 @@
 #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 snprintf _snprintf
-  #define vsnprintf _vsnprintf
-  #define strcasecmp stricmp
-  #define strncasecmp strnicmp
+#ifdef MSVC
+#include "msvc_compat.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif
-#ifdef HAVE_DMALLOC
-#include <dmalloc.h>
-#endif
-#ifdef HAVE_PNG
-  #include "png.h"
-#endif
-#ifdef HAVE_G2_H
-extern "C" { 
-#include "g2.h" 
-}
-#ifdef HAVE_X11
-extern "C" {
-#include "g2_X11.h"
-}
+
+#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 <string>
+#include <iterator>
+#include <algorithm>
+#include <exception>
+#include <stdexcept>
+#include <memory>
+
+#else
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
 #endif
+#ifdef HAVE_MATH_H
+#include <math.h>
 #endif
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -73,18 +85,37 @@ extern "C" {
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #endif
+
+#endif
+
+
+#ifdef HAVE_DMALLOC
+#include <dmalloc.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_PNG
+  #include "png.h"
+#endif
+#ifdef HAVE_G2_H
+extern "C" { 
+#include "g2.h" 
+}
+#ifdef HAVE_X11
+extern "C" {
+#include "g2_X11.h"
+}
+#endif
+#endif
+
+
 #ifdef  HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #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 +125,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,24 +144,12 @@ extern "C" {
 #include <assert.h>
 #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
 #include "mpi++.h"
 #include "mpiworld.h"
@@ -154,8 +170,12 @@ using namespace std;
 #include "phantom.h"
 #include "scanner.h"
 #include "backprojectors.h"
-#include "filter.h"
+#include "filter.h"
+#include "fourier.h"
+#include "procsignal.h"
 #include "projections.h"
+#include "reconstruct.h"
+#include "plotfile.h"
 #include "trace.h"