X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fct.h;h=2172063b6d2d717c098776a4825b0edf8f542161;hb=0eb095f799dd4222e6eb9b1db9e8c6f2831a1540;hp=84e139f8f892f86b65a0906ffc01500aefbec697;hpb=55426f4170ed9dc777c3cec3741e4a59e6eebd38;p=ctsim.git diff --git a/include/ct.h b/include/ct.h index 84e139f..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.42 2000/12/06 15:17:51 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 @@ -29,13 +29,7 @@ #define CT_H #ifdef MSVC - // extern "C" {int strcasecmp(const char*, const char*);} - typedef long off_t; - #define HAVE_STRING_H 1 - #include - #define strdup _strdup - #define strcasecmp _stricmp - #define strncasecmp _strnicmp +#include "msvc_compat.h" #endif #ifdef HAVE_CONFIG_H @@ -52,14 +46,13 @@ #include #include #include -using namespace std; - -#if defined(MSVC) || HAVE_SSTREAM + +#if defined(MSVC) || HAVE_SSTREAM #include -#else -#include -#endif - +#else +#include +#endif + #include #include #include @@ -155,6 +148,7 @@ extern "C" { #ifdef HAVE_FFTW #include #include +#define HAVE_FFT 1 #endif #ifdef HAVE_MPI @@ -178,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"