X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=e6ebd5d8083a22c1ad4fe24a70086c5e2aee10bc;hp=48d93105f2a9fd274e1c0866e858aa761712dc5c;hb=7f8f356151b0c8db0dbbf1c1896cc22630d6c774;hpb=615897c12a43e380f07081c65f877a5e03da86ee

diff --git a/include/ct.h b/include/ct.h
index 48d9310..e6ebd5d 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.36 2000/11/28 22:10:59 kevin Exp $
+**  $Id: ct.h,v 1.52 2001/01/12 16:41:56 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,13 +28,10 @@
 #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
@@ -43,24 +40,29 @@
 
 #define HAVE_ANSI_CPP 1
 #ifdef HAVE_ANSI_CPP
-#include <cmath>
 #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>
-using namespace std;
 
 #else
 
@@ -148,6 +150,7 @@ extern "C" {
 #ifdef HAVE_FFTW
 #include <rfftw.h>
 #include <fftw.h>
+#define HAVE_FFT 1
 #endif
 
 #ifdef HAVE_MPI
@@ -156,6 +159,7 @@ extern "C" {
 #endif
 
 #include "ctsupport.h"
+#include "ctglobals.h"
 #include "fnetorderstream.h"
 
 #ifdef HAVE_SGP
@@ -171,9 +175,11 @@ extern "C" {
 #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"