Fix all remaining compiler warnings

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index 0608d2f32e802938f178c65d024e38c3e6715bb1..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-2001 Kevin Rosenberg
-**
-**  $Id$
+**  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
@@ -106,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" {
@@ -153,8 +151,7 @@ extern "C" {
 
 
 #ifdef HAVE_FFTW
-#include <rfftw.h>
-#include <fftw.h>
+#include <fftw3.h>
 #define HAVE_FFT 1
 #endif
 
@@ -188,5 +185,7 @@ extern "C" {
 
 #include "ctglobals.h"
 
-#endif
+// Macro to remove compiler warnings about unused variables
+#define UNUSED(expr) do { (void)(expr); } while (0)
 
+#endif