* 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.

diff --git a/ChangeLog b/ChangeLog
index d396aed7017e4414a46855e0607535b6f903888f..3121514fd8fc4ae3c746e3b641d751539004278f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-29  Richard Kreckel  <kreckel@ginac.de>
+
+        * 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  <kreckel@ginac.de>
 
         * 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 4064e9664342ac063d930de0f728006290efa868..06bfbb2439902d7f99381b039a7fee05a544572b 100644 (file)
--- 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 b2314cd433432866db8bd442d773cbb4b34dfc5c..37560e259ee2670eedb60c83b69f23923d88e447 100644 (file)
--- a/src/complex/input/cl_N_read.cc
+++ b/src/complex/input/cl_N_read.cc
@@ -24,6 +24,11 @@
 #undef floor
 #include <cmath>
 #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 e2f9b495cd4e52b9d6a7b3762a557f7532d0a2aa..9cd38848938b2cb3ba048c5604bced85eaa4c257 100644 (file)
--- a/src/real/input/cl_R_read.cc
+++ b/src/real/input/cl_R_read.cc
@@ -24,6 +24,11 @@
 #undef floor
 #include <cmath>
 #define floor cln_floor
+// Ugh, some compilers #define stderr, confusing cln::stderr
+#ifdef stderr
+  #undef stderr
+#endif
+
 
 namespace cln {