r348: fix linefeed problem

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index cfdd9dcf558bae1f0b9606b9550a55d8cb0bf4ee..98425a16aae164c22b2f2b4c52aa5861bf729c15 100644 (file)
--- 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.37 2000/11/29 07:58:13 kevin Exp $
+**  $Id: ct.h,v 1.49 2001/01/02 16:02:12 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,8 @@
 #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
+#ifdef MSVC
+#include "msvc_compat.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -43,6 +38,7 @@
 
 #define HAVE_ANSI_CPP 1
 #ifdef HAVE_ANSI_CPP
+#include <complex>
 #include <cmath>
 #include <cstdio>
 #include <cctype>
@@ -50,12 +46,15 @@
 #include <cstddef>
 #include <cstdarg>
 #include <cstdlib>
-using namespace std;
 
-#include <complex>
+#if defined(MSVC) || HAVE_SSTREAM
+#include <sstream>
+#else
+#include <sstream_subst>
+#endif
+
 #include <fstream>
 #include <iostream>
-#include <sstream>
 #include <string>
 #include <iterator>
 #include <algorithm>
@@ -172,9 +171,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"