If isnan is a macro, assume it is type-variadic or can handle float as

well. This fixes the build on DragonFly and other platforms without
isnanf.

2 files changed, 32 insertions, 0 deletions

diff --git a/audio/festival/patches/patch-af b/audio/festival/patches/patch-af
new file mode 100644
index 00000000000..a10c84ef98c
--- /dev/null
+++ b/audio/festival/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.3 2007/09/02 11:02:59 joerg Exp $
+
+--- speech_tools/sigpr/pda/smooth_pda.cc.orig	2007-09-02 09:36:35.000000000 +0000
++++ speech_tools/sigpr/pda/smooth_pda.cc
+@@ -112,7 +112,11 @@ void smooth_portion(EST_Track &c, EST_Fe
+ 
+     for (i = 0; i < c.num_frames(); ++i)
+     {   // occasionally NaNs result...
++#if defined(isnan)
++	if (isnan(a[i]))
++#else
+ 	if (isnanf(a[i]))
++#endif
+ 	{
+ 	    c.set_break(i);
+ 	    c.a(i) = 0.0;
diff --git a/audio/festival/patches/patch-ag b/audio/festival/patches/patch-ag
new file mode 100644
index 00000000000..c4a10594c43
--- /dev/null
+++ b/audio/festival/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.4 2007/09/02 11:03:03 joerg Exp $
+
+--- speech_tools/stats/confusion.cc.orig	2007-09-02 09:59:39.000000000 +0000
++++ speech_tools/stats/confusion.cc
+@@ -138,7 +138,11 @@ void print_confusion(const EST_FMatrix &
+ 	cout.precision(3);
+ 	cout.setf(ios::right);
+ //	cout.setf(ios::fixed, ios::floatfield);
++#ifdef isnan
++	if (isnan(correct(i)))
++#else
+ 	if (isnanf(correct(i)))
++#endif
+ 	    cout << endl;
+ 	else
+ 	    cout << correct(i) << endl;