[Gnash-commit] /srv/bzr/gnash/trunk r9598: undef isnan, otherwise we get conflicts on NetBSD.

[rob]

------------------------------------------------------------
revno: 9598
committer: address@hidden
branch nick: trunk
timestamp: Fri 2008-08-15 11:04:43 -0600
message:
  undef isnan, otherwise we get conflicts on NetBSD.
modified:
  libcore/as_value.h

=== modified file 'libcore/as_value.h'
--- a/libcore/as_value.h        2008-07-13 15:33:11 +0000
+++ b/libcore/as_value.h        2008-08-15 17:04:43 +0000
@@ -50,17 +50,19 @@
 class asName;
 
 #ifndef NAN
-#       define NAN (std::numeric_limits<double>::quiet_NaN())
+# define NAN (std::numeric_limits<double>::quiet_NaN())
 #endif
 
 #ifndef INFINITY
-#       define INFINITY (std::numeric_limits<double>::infinity())
+# define INFINITY (std::numeric_limits<double>::infinity())
 #endif
 
+// NetBSD has issues with isnan, and tries to force us to use
+// the macro even when we want to use our own type safe version.
+#undef isnan
 
 // The following template works just like its C counterpart, with added
 // type safety (i.e., they will only compile for floating point arguments).
-
 template <typename T>
 inline bool
 isnan(const T& num, typename boost::enable_if<boost::is_floating_point<T> 
>::type* dummy = 0)