=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/fft/dft.h,v retrieving revision 1.4 retrieving revision 1.6 diff -u -p -r1.4 -r1.6 --- OpenXM_contrib2/asir2000/fft/dft.h 2003/02/14 22:29:10 1.4 +++ 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.3 2000/08/22 05:04:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/fft/dft.h,v 1.5 2007/09/15 10:17:08 noro Exp $ */ -#if defined(LONG_IS_32BIT) +#if SIZEOF_LONG == 4 #if defined(VISUAL) typedef unsigned _int64 UL; #else @@ -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) }