projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r266: *** empty log message ***
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index f9dd6d815474b569b049db665b252b399486b6ed..e920a562bcf4a1ad503779b89b6afa49856d79ce 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
**
** 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.
45 2000/12/16 06:12:47
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
**
** 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,33
+28,53
@@
#ifndef CT_H
#define CT_H
#ifndef CT_H
#define CT_H
-#ifdef
_WIN32
- extern "C" {int strcasecmp(const char*, const char*);}
+#ifdef
MSVC
+
//
extern "C" {int strcasecmp(const char*, const char*);}
typedef long off_t;
typedef long off_t;
- #define HAVE_STRING_H 1
- #include <fcntl.h>
- #define strcasecmp stricmp
- #define strncasecmp strnicmp
+ #define HAVE_STRING_H 1
\r
+ #include <fcntl.h>
\r
+ #define strdup _strdup
+ #define strcasecmp _stricmp
+ #define strncasecmp _strnicmp
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-#ifdef HAVE_DMALLOC
-#include <dmalloc.h>
-#endif
-#ifdef HAVE_PNG
- #include "png.h"
-#endif
-#ifdef HAVE_G2_H
-extern "C" {
-#include "g2.h"
-}
-#ifdef HAVE_X11
-extern "C" {
-#include "g2_X11.h"
-}
+
\r
+#define HAVE_ANSI_CPP 1
+#ifdef HAVE_ANSI_CPP
+#include <complex>
+#include <cmath>
+#include <cstdio>
+#include <cctype>
+#include <cstring>
+#include <cstddef>
+#include <cstdarg>
+#include <cstdlib>
+
\r
+#if defined(MSVC) || HAVE_SSTREAM
\r
+#include <sstream>
+#else
\r
+#include <sstream_subst>
+#endif
\r
+
\r
+#include <fstream>
+#include <iostream>
+#include <string>
\r
+#include <iterator>
+#include <algorithm>
+#include <exception>
+#include <stdexcept>
+#include <memory>
+
+#else
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
#endif
#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>
@@
-71,18
+91,37
@@
extern "C" {
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
+
+#endif
+
+
+#ifdef HAVE_DMALLOC
+#include <dmalloc.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_PNG
+ #include "png.h"
+#endif
+#ifdef HAVE_G2_H
+extern "C" {
+#include "g2.h"
+}
+#ifdef HAVE_X11
+extern "C" {
+#include "g2_X11.h"
+}
+#endif
+#endif
+
+
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.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
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#endif
@@
-92,9
+131,6
@@
extern "C" {
#if defined(HAVE_GETOPT_H) || defined(HAVE_GETOPT_LONG)
#include <getopt.h>
#endif
#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
#ifdef HAVE_SETJMP_H
#include <setjmp.h>
#endif
@@
-114,24
+150,12
@@
extern "C" {
#include <assert.h>
#endif
#include <assert.h>
#endif
+
#ifdef HAVE_FFTW
#include <rfftw.h>
#include <fftw.h>
#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
#include "mpi++.h"
#include "mpiworld.h"
#ifdef HAVE_MPI
#include "mpi++.h"
#include "mpiworld.h"