===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/fft/dft.h,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM_contrib2/asir2000/fft/dft.h	2000/08/22 05:04:12	1.3
+++ OpenXM_contrib2/asir2000/fft/dft.h	2018/03/29 01:32:53	1.8
@@ -45,30 +45,28 @@
  * 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.7 2009/03/16 16:56:35 ohara Exp $ 
 */
-#if LONG_IS_32BIT
-#if defined(VISUAL)
-typedef unsigned _int64 UL;
-#else
+#if SIZEOF_LONG == 8
+typedef unsigned long UL;
+#elif defined(HAVE_UNSIGNED_LONG_LONG)
 typedef unsigned long long UL;
+#elif defined(_MSC_VER)
+typedef unsigned _int64 UL;
 #endif
-#else
-typedef unsigned long UL;
-#endif
 
 struct PrimesS {
-	int	prime, primroot;
-	int  bitwid, d;
+  int  prime, primroot;
+  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) \
@@ -99,6 +97,12 @@ typedef float ModNum;
 
 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) }
 
@@ -119,17 +123,17 @@ typedef unsigned int ModNum;
 
 void C_DFT_FORE(ModNum *,int,int,int,ModNum *,
 #ifdef POWA_STRIDE
-	int
+  int
 #else
-	ModNum *,int,ModNum,double,ModNum *
+  ModNum *,int,ModNum,double,ModNum *
 #endif
 );
 
 void C_DFT_BACK(ModNum *,int,int,int,ModNum *,
 #ifdef POWA_STRIDE
-		 int
+     int
 #else
-		 ModNum *,int,int,int,ModNum,ModNum,double,ModNum *
+     ModNum *,int,int,int,ModNum,ModNum,double,ModNum *
 #endif
 );