* src/numtheory/cl_nt_sqrtmodp.cc: #undef _R.

        Reported by Andrew Rechnitzer <A.Rechnitzer@ms.unimelb.edu.au>.

diff --git a/ChangeLog b/ChangeLog
index d832787ab16f150218e6e8ac62b8a6c8d27877f5..06fd1f8828c65ac8ac1d4debb9d5dfe17602aa2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-06  Richard Kreckel  <kreckel@ginac.de>
+
+       * src/numtheory/cl_nt_sqrtmodp.cc: #undef _R.
+       Reported by Andrew Rechnitzer <A.Rechnitzer@ms.unimelb.edu.au>.
+
 2003-08-01  Richard Kreckel  <kreckel@ginac.de>
 
        More dependent base resolution issues

diff --git a/src/numtheory/cl_nt_sqrtmodp.cc b/src/numtheory/cl_nt_sqrtmodp.cc
index 098c4065e0803c1146fe63d473dd43f4b6076ffe..cf2556eb75420f94bff90ad90117b0892e4f97f5 100644 (file)
--- a/src/numtheory/cl_nt_sqrtmodp.cc
+++ b/src/numtheory/cl_nt_sqrtmodp.cc
@@ -16,6 +16,9 @@
 #include <cmath>
 #define floor cln_floor
 
+// MacOS X does "#define _R 0x00040000L".  Grr...
+#undef _R
+
 namespace cln {
 
 // Algorithm 1 (for very small p only):