X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fct.h;h=2172063b6d2d717c098776a4825b0edf8f542161;hb=0eb095f799dd4222e6eb9b1db9e8c6f2831a1540;hp=cfdd9dcf558bae1f0b9606b9550a55d8cb0bf4ee;hpb=a9c9c7d1a1068e92145c923fab2801149e0e6899;p=ctsim.git diff --git a/include/ct.h b/include/ct.h index cfdd9dc..2172063 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.37 2000/11/29 07:58:13 kevin Exp $ +** $Id: ct.h,v 1.50 2001/01/03 22:00:46 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 - #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 #include #include #include @@ -50,12 +46,15 @@ #include #include #include -using namespace std; -#include +#if defined(MSVC) || HAVE_SSTREAM +#include +#else +#include +#endif + #include #include -#include #include #include #include @@ -149,6 +148,7 @@ extern "C" { #ifdef HAVE_FFTW #include #include +#define HAVE_FFT 1 #endif #ifdef HAVE_MPI @@ -172,9 +172,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"