===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/fft/dft.h,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM_contrib2/asir2000/fft/dft.h	2000/08/21 08:31:33	1.2
+++ OpenXM_contrib2/asir2000/fft/dft.h	2009/03/16 16:56:35	1.7
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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.1.1.1 1999/12/03 07:39:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/fft/dft.h,v 1.6 2009/03/16 16:43:02 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;
 };
 
-#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 +96,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) }