projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r306: Changes for PlotFile support
[ctsim.git]
/
include
/
ct.h
diff --git
a/include/ct.h
b/include/ct.h
index 0928b91f8807dcc25d3cb986ba13e68248f2bf21..652df0c964f197206b07f1defefa3da51783e956 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.4
1 2000/12/04 05:36:57
kevin Exp $
+** $Id: ct.h,v 1.4
7 2000/12/19 21:37:51
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
@@
-29,18
+29,13
@@
#define CT_H
#ifdef MSVC
#define CT_H
#ifdef MSVC
- extern "C" {int strcasecmp(const char*, const char*);}
- typedef long off_t;
- #define HAVE_STRING_H 1
- #include <fcntl.h>
- #define strcasecmp stricmp
- #define strncasecmp strnicmp
+#include "msvc_compat.h"
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#endif
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-
+
\r
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
#include <complex>
#define HAVE_ANSI_CPP 1
#ifdef HAVE_ANSI_CPP
#include <complex>
@@
-51,12
+46,16
@@
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
#include <cstddef>
#include <cstdarg>
#include <cstdlib>
-using namespace std;
-
+
\r
+#if defined(MSVC) || HAVE_SSTREAM
\r
#include <sstream>
#include <sstream>
+#else
\r
+#include <sstream_subst>
+#endif
\r
+
\r
#include <fstream>
#include <iostream>
#include <fstream>
#include <iostream>
-#include <string>
+#include <string>
\r
#include <iterator>
#include <algorithm>
#include <exception>
#include <iterator>
#include <algorithm>
#include <exception>
@@
-175,6
+174,7
@@
extern "C" {
#include "procsignal.h"
#include "projections.h"
#include "reconstruct.h"
#include "procsignal.h"
#include "projections.h"
#include "reconstruct.h"
+#include "plotfile.h"
\r
#include "trace.h"
#include "trace.h"