X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=e6ebd5d8083a22c1ad4fe24a70086c5e2aee10bc;hp=d69eaddcdd8591183a0d8b823a9d5e111d0af8f5;hb=7f8f356151b0c8db0dbbf1c1896cc22630d6c774;hpb=82050376ed26c1a3e77445474f88a278ff0a5268 diff --git a/include/ct.h b/include/ct.h index d69eadd..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.38 2000/11/30 22:11:21 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 - #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 @@ -51,11 +48,15 @@ #include #include #include -using namespace std; + +#if defined(MSVC) || HAVE_SSTREAM +#include +#else +#include +#endif #include #include -#include #include #include #include @@ -149,6 +150,7 @@ extern "C" { #ifdef HAVE_FFTW #include #include +#define HAVE_FFT 1 #endif #ifdef HAVE_MPI @@ -157,6 +159,7 @@ extern "C" { #endif #include "ctsupport.h" +#include "ctglobals.h" #include "fnetorderstream.h" #ifdef HAVE_SGP @@ -172,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"