r219: *** empty log message ***

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index f9dd6d815474b569b049db665b252b399486b6ed..8750cab54e24cc192f5342d24e99c45fba7f704b 100644 (file)
--- 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.33 2000/09/09 09:31:11 kevin Exp $
+**  $Id: ct.h,v 1.34 2000/11/28 14:54:07 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
@@ -40,9 +40,29 @@
 #ifdef HAVE_CONFIG_H
   #include <config.h>
 #endif
+
+#include <cmath>
+#include <complex>
+#include <cstdio>
+#include <cctype>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <iterator>
+#include <algorithm>
+#include <exception>
+#include <stdexcept>
+#include <memory>
+
+#define __MATH_H__ 1
+
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>
 #endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #ifdef HAVE_PNG
   #include "png.h"
 #endif
@@ -56,9 +76,7 @@ extern "C" {
 }
 #endif
 #endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
+
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
@@ -77,12 +95,6 @@ extern "C" {
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-#ifdef HAVE_MATH_H
-#include <math.h>
-#endif
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif
@@ -92,9 +104,6 @@ extern "C" {
 #if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
 #include <getopt.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_SETJMP_H
 #include <setjmp.h>
 #endif
@@ -114,22 +123,24 @@ extern "C" {
 #include <assert.h>
 #endif
 
+
+#if 0
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#endif
+
 #ifdef HAVE_FFTW
 #include <rfftw.h>
 #include <fftw.h>
 #endif
 
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <iterator>
-#include <algorithm>
-#include <exception>
-#include <stdexcept>
-#include <memory>
-#include <complex>
-
 using namespace std;
 
 #ifdef HAVE_MPI