===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/fft/dft.h,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -p -r1.3 -r1.6
--- OpenXM_contrib2/asir2000/fft/dft.h	2000/08/22 05:04:12	1.3
+++ OpenXM_contrib2/asir2000/fft/dft.h	2009/03/16 16:43:02	1.6
@@ -45,9 +45,9 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/fft/dft.h,v 1.2 2000/08/21 08:31:33 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/fft/dft.h,v 1.5 2007/09/15 10:17:08 noro Exp $ 
 */
-#if LONG_IS_32BIT
+#if SIZEOF_LONG == 4
 #if defined(VISUAL)
 typedef unsigned _int64 UL;
 #else
@@ -62,13 +62,13 @@ struct PrimesS {
 	int  bitwid, d;
 };
 
-#if USE_FLOAT
+#if defined(USE_FLOAT)
 #define NPrimes 536
 #else
 #define NPrimes 13681
 #endif
 
-#if USE_FLOAT
+#if defined(USE_FLOAT)
 typedef float ModNum;
 
 #define AxBplusCmodP(ans,anstype,a,b,c,p,pinv) \
@@ -98,6 +98,12 @@ typedef float ModNum;
 #include "inline.h"
 
 typedef unsigned int ModNum;
+
+/* XXX */
+#if defined(__DARWIN__)
+#undef DMAR
+#define DMAR(a1,a2,a3,d,r) (r)=dmar(a1,a2,a3,d);
+#endif
 
 #define AxBplusCmodP(ans,anstype,a,b,c,p,pinv) \
   { DMAR(a,b,c,p,ans) }