Make proper autoconf test for availability of posix nan function inst…

…ead of fudging with the NAN macro. darcs-hash:20090202232049-ac50b-0176955677ff39fdd05eeefa20dca883863c34e6.gz
chendo · Feb 2, 2009 · 35258bf · 35258bf
1 parent 72025a6
commit 35258bf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/common.c b/common.c
@@ -1815,7 +1815,7 @@ double timef()
 
 	if( time_res ) 
 	{
-		return NAN;
+		return nan(0);
 	}
 
 	return (double)tv.tv_sec + 0.000001*tv.tv_usec;

diff --git a/configure.ac b/configure.ac
@@ -505,6 +505,7 @@ LIBS=""
 AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
 AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
 AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
+AC_SEARCH_LIBS( [nan], [m], [AC_DEFINE( [HAVE_NAN], [1], [Define to 1 if you have the nan function])] )
 LIBS_SHARED=$LIBS
 LIBS=$LIBS_COMMON
 

diff --git a/fallback.c b/fallback.c
@@ -1183,5 +1183,12 @@ long sysconf(int name)
 	return -1;
 
 }
+#endif
 
+#ifndef HAVE_NAN
+double nan(char *tagp)
+{
+	return 0.0/0.0;
+}
 #endif
+
diff --git a/fallback.h b/fallback.h
@@ -469,8 +469,9 @@ long sysconf(int name);
 
 #endif
 
-#ifndef NAN
-#define NAN (0.0/0.0)
+#ifndef HAVE_NAN
+double nan(char *tagp);
 #endif
 
+
 #endif