X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=a36412f097b98936b7461c2b4e824b2238182b67;hp=0928b91f8807dcc25d3cb986ba13e68248f2bf21;hb=c70eb596eeeeda21f872065d9e11a67996394626;hpb=01ee1e0085970643368d65c38b09008927e24cd5 diff --git a/include/ct.h b/include/ct.h index 0928b91..a36412f 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.41 2000/12/04 05:36:57 kevin Exp $ +** $Id: ct.h,v 1.53 2001/01/13 03:51:35 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 +#define NO_MAIN 1 // filter out all old main blocks + #ifdef MSVC - extern "C" {int strcasecmp(const char*, const char*);} - typedef long off_t; - #define HAVE_STRING_H 1 - #include - #define strcasecmp stricmp - #define strncasecmp strnicmp +#include "msvc_compat.h" #endif #ifdef HAVE_CONFIG_H @@ -51,9 +48,13 @@ #include #include #include -using namespace std; +#if defined(MSVC) || HAVE_SSTREAM #include +#else +#include +#endif + #include #include #include @@ -149,6 +150,7 @@ extern "C" { #ifdef HAVE_FFTW #include #include +#define HAVE_FFT 1 #endif #ifdef HAVE_MPI @@ -172,11 +174,14 @@ 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" +#include "ctglobals.h" #endif