From 1897760a44c001651b60283a2fbbb547bb7c2cb8 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Mon, 30 Oct 2000 17:44:15 +0000 Subject: [PATCH] * src/real/input/cl_R_read.cc, src/complex/input/cl_N_read.cc: #undef stderr, if it's defined so cln::stderr isn't confused. * src/base/input/cl_read_globals.cc: stdin should not be extern. --- ChangeLog | 6 ++++++ src/base/input/cl_read_globals.cc | 2 +- src/complex/input/cl_N_read.cc | 5 +++++ src/real/input/cl_R_read.cc | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d396aed..3121514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-29 Richard Kreckel + + * src/real/input/cl_R_read.cc, src/complex/input/cl_N_read.cc: + #undef stderr, if it's defined so cln::stderr isn't confused. + * src/base/input/cl_read_globals.cc: stdin should not be extern. + 2000-09-05 Richard Kreckel * include/cln/number.h (As): Fix it in namespace by suffixing `_As' diff --git a/src/base/input/cl_read_globals.cc b/src/base/input/cl_read_globals.cc index 4064e96..06bfbb2 100644 --- a/src/base/input/cl_read_globals.cc +++ b/src/base/input/cl_read_globals.cc @@ -7,6 +7,6 @@ namespace cln { -extern cl_istream stdin = std::cin; +cl_istream stdin = std::cin; } // namespace cln diff --git a/src/complex/input/cl_N_read.cc b/src/complex/input/cl_N_read.cc index b2314cd..37560e2 100644 --- a/src/complex/input/cl_N_read.cc +++ b/src/complex/input/cl_N_read.cc @@ -24,6 +24,11 @@ #undef floor #include #define floor cln_floor +// Ugh, some compilers #define stderr, confusing cln::stderr +#ifdef stderr + #undef stderr +#endif + namespace cln { diff --git a/src/real/input/cl_R_read.cc b/src/real/input/cl_R_read.cc index e2f9b49..9cd3884 100644 --- a/src/real/input/cl_R_read.cc +++ b/src/real/input/cl_R_read.cc @@ -24,6 +24,11 @@ #undef floor #include #define floor cln_floor +// Ugh, some compilers #define stderr, confusing cln::stderr +#ifdef stderr + #undef stderr +#endif + namespace cln {