Fix all remaining compiler warnings

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index 98425a16aae164c22b2f2b4c52aa5861bf729c15..4a4734b68fdd0a0119e59b80d374278f3102b046 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
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: ct.h,v 1.49 2001/01/02 16:02:12 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
@@ -28,6 +26,8 @@
 #ifndef CT_H
 #define CT_H
 
+#define NO_MAIN 1    // filter out all old main blocks
+
 #ifdef MSVC
 #include "msvc_compat.h"
 #endif
@@ -36,6 +36,11 @@
   #include <config.h>
 #endif
 
+#ifdef _DEBUG
+#undef DEBUG
+#define DEBUG 1
+#endif
+
 #define HAVE_ANSI_CPP 1
 #ifdef HAVE_ANSI_CPP
 #include <complex>
@@ -99,8 +104,8 @@
   #include "png.h"
 #endif
 #ifdef HAVE_G2_H
-extern "C" { 
-#include "g2.h" 
+extern "C" {
+#include "g2.h"
 }
 #ifdef HAVE_X11
 extern "C" {
@@ -146,8 +151,8 @@ extern "C" {
 
 
 #ifdef HAVE_FFTW
-#include <rfftw.h>
-#include <fftw.h>
+#include <fftw3.h>
+#define HAVE_FFT 1
 #endif
 
 #ifdef HAVE_MPI
@@ -178,6 +183,9 @@ extern "C" {
 #include "plotfile.h"
 #include "trace.h"
 
+#include "ctglobals.h"
 
-#endif
+// Macro to remove compiler warnings about unused variables
+#define UNUSED(expr) do { (void)(expr); } while (0)
 
+#endif