projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add openmp m4 script
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index e6ebd5d8083a22c1ad4fe24a70086c5e2aee10bc..84f1e917c1279a33ec97dd479ef3522a6fc759f5 100644
(file)
--- a/
include/ct.h
+++ b/
include/ct.h
@@
-7,9
+7,7
@@
** Date Started: Aug 1984
**
** This is part of the CTSim program
** Date Started: Aug 1984
**
** This is part of the CTSim program
-** Copyright (C) 1983-2000 Kevin Rosenberg
-**
-** $Id: ct.h,v 1.52 2001/01/12 16:41:56 kevin Exp $
+** Copyright (c) 1983-2009 Kevin Rosenberg
**
** 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
**
** 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
@@
-38,6
+36,11
@@
#include <config.h>
#endif
#include <config.h>
#endif
+#ifdef _DEBUG
+#undef DEBUG
+#define DEBUG 1
+#endif
+
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
#include <complex>
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
#include <complex>
@@
-101,8
+104,8
@@
#include "png.h"
#endif
#ifdef HAVE_G2_H
#include "png.h"
#endif
#ifdef HAVE_G2_H
-extern "C" {
-#include "g2.h"
+extern "C" {
+#include "g2.h"
}
#ifdef HAVE_X11
extern "C" {
}
#ifdef HAVE_X11
extern "C" {
@@
-148,8
+151,7
@@
extern "C" {
#ifdef HAVE_FFTW
#ifdef HAVE_FFTW
-#include <rfftw.h>
-#include <fftw.h>
+#include <fftw3.h>
#define HAVE_FFT 1
#endif
#define HAVE_FFT 1
#endif
@@
-159,7
+161,6
@@
extern "C" {
#endif
#include "ctsupport.h"
#endif
#include "ctsupport.h"
-#include "ctglobals.h"
#include "fnetorderstream.h"
#ifdef HAVE_SGP
#include "fnetorderstream.h"
#ifdef HAVE_SGP
@@
-182,6
+183,7
@@
extern "C" {
#include "plotfile.h"
#include "trace.h"
#include "plotfile.h"
#include "trace.h"
+#include "ctglobals.h"
#endif
#endif