r222: *** empty log message ***

diff --git a/include/ct.h b/include/ct.h
index 99d20131fd2cca2742eed7dc39288108a389a8a0..48d93105f2a9fd274e1c0866e858aa761712dc5c 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.35 2000/11/28 15:37:52 kevin Exp $
+**  $Id: ct.h,v 1.36 2000/11/28 22:10:59 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
@@ -41,6 +41,8 @@
   #include <config.h>
 #endif
 
+#define HAVE_ANSI_CPP 1
+#ifdef HAVE_ANSI_CPP
 #include <cmath>
 #include <complex>
 #include <cstdio>
@@ -58,8 +60,34 @@
 #include <cstddef>
 #include <cstdarg>
 #include <cstdlib>
+using namespace std;
+
+#else
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
+#endif
 
-#define __MATH_H__ 1
 
 #ifdef HAVE_DMALLOC
 #include <dmalloc.h>
@@ -117,38 +145,11 @@ extern "C" {
 #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
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-
-#endif
-
 #ifdef HAVE_FFTW
 #include <rfftw.h>
 #include <fftw.h>
 #endif
 
-using namespace std;
-
 #ifdef HAVE_MPI
 #include "mpi++.h"
 #include "mpiworld.h"