X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=9ee346bf018c1385518893e9f844a17d7443884b;hp=0928b91f8807dcc25d3cb986ba13e68248f2bf21;hb=d42d3d062dd1aca92b5a2552a1f474aab0bee610;hpb=01ee1e0085970643368d65c38b09008927e24cd5 diff --git a/include/ct.h b/include/ct.h index 0928b91..9ee346b 100644 --- a/include/ct.h +++ b/include/ct.h @@ -7,9 +7,9 @@ ** Date Started: Aug 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: ct.h,v 1.41 2000/12/04 05:36:57 kevin Exp $ +** $Id$ ** ** 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,19 +28,21 @@ #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 #include #endif +#ifdef _DEBUG +#undef DEBUG +#define DEBUG 1 +#endif + #define HAVE_ANSI_CPP 1 #ifdef HAVE_ANSI_CPP #include @@ -51,9 +53,13 @@ #include #include #include -using namespace std; +#if defined(MSVC) || HAVE_SSTREAM #include +#else +#include +#endif + #include #include #include @@ -147,8 +153,8 @@ extern "C" { #ifdef HAVE_FFTW -#include -#include +#include +#define HAVE_FFT 1 #endif #ifdef HAVE_MPI @@ -172,11 +178,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