===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/fft/dft.h,v
retrieving revision 1.1.1.1
retrieving revision 1.8
diff -u -p -r1.1.1.1 -r1.8
--- OpenXM_contrib2/asir2000/fft/dft.h	1999/12/03 07:39:08	1.1.1.1
+++ OpenXM_contrib2/asir2000/fft/dft.h	2018/03/29 01:32:53	1.8
@@ -1,26 +1,72 @@
-/* $OpenXM: OpenXM/src/asir99/fft/dft.h,v 1.1.1.1 1999/11/10 08:12:27 noro Exp $ */
-#if LONG_IS_32BIT
-#if defined(VISUAL)
-typedef unsigned _int64 UL;
-#else
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * 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@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * 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.7 2009/03/16 16:56:35 ohara Exp $ 
+*/
+#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) \
@@ -51,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) }
 
@@ -71,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
 );