X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fct.h;h=99d20131fd2cca2742eed7dc39288108a389a8a0;hb=75f16c2cce21659cd370b8d3090a6905cbdc6cca;hp=674aba936264a7c063b6d55479109eb6464db1dd;hpb=04d5009bc18e7bf51ab9d8fab1e8c6a1a86af919;p=ctsim.git

diff --git a/include/ct.h b/include/ct.h
index 674aba9..99d2013 100644
--- 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.29 2000/08/03 09:21:12 kevin Exp $
+**  $Id: ct.h,v 1.35 2000/11/28 15:37:52 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
@@ -28,14 +28,11 @@
 #ifndef CT_H
 #define CT_H
 
-extern "C" {int strcasecmp(const char*, const char*);}
-
 #ifdef _WIN32
+  extern "C" {int strcasecmp(const char*, const char*);}
   typedef long off_t;
   #define HAVE_STRING_H 1
   #include <fcntl.h>
-  #define snprintf _snprintf
-  #define vsnprintf _vsnprintf
   #define strcasecmp stricmp
   #define strncasecmp strnicmp
 #endif
@@ -43,9 +40,33 @@ extern "C" {int strcasecmp(const char*, const char*);}
 #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>
+#include <cstring>
+#include <cstddef>
+#include <cstdarg>
+#include <cstdlib>
+
+#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
@@ -59,33 +80,14 @@ extern "C" {
 }
 #endif
 #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
+
+
 #ifdef  HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #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
@@ -95,9 +97,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
@@ -117,22 +116,37 @@ 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
+#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
 
-#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
@@ -156,7 +170,9 @@ using namespace std;
 #include "scanner.h"
 #include "backprojectors.h"
 #include "filter.h"
+#include "procsignal.h"
 #include "projections.h"
+#include "reconstruct.h"
 #include "trace.h"