[libav-devel] [PATCH] Work around a broken limits.h header on {Net, Open}BSD.

Anton Khirnov anton at khirnov.net
Thu Nov 14 20:50:28 CET 2013


It defines {FLT,DBL}_{MAX,MIN} macros, even though float.h is supposed
to do that. Those values are not exactly representable double/float as
the specification mandates, which breaks code (e.g. in vf_fps) like

double f = DBL_MAX;
[...]
if (f == DBL_MAX) { // f has not been changed yet
    [....]
}
---
I have tested that this fixes FATE failures on a 32bit netbsd
---
 compat/bsd/limits.h |   41 +++++++++++++++++++++++++++++++++++++++++
 configure           |    2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 compat/bsd/limits.h

diff --git a/compat/bsd/limits.h b/compat/bsd/limits.h
new file mode 100644
index 0000000..f63a349
--- /dev/null
+++ b/compat/bsd/limits.h
@@ -0,0 +1,41 @@
+/*
+ * Work around the broken limits.h header on some BSD flavors, which define
+ * invalid values of floating point limits.
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef LIBAV_COMPAT_BSD_LIMITS_H
+#define LIBAV_COMPAT_BSD_LIMITS_H
+
+#include_next <limits.h>
+
+#ifdef FLT_MAX
+#undef  FLT_MAX
+#define FLT_MAX 3.40282346638528859812e+38F
+
+#undef  FLT_MIN
+#define FLT_MIN 1.17549435082228750797e-38F
+
+#undef  DBL_MAX
+#define DBL_MAX ((double)1.79769313486231570815e+308L)
+
+#undef  DBL_MIN
+#define DBL_MIN ((double)2.22507385850720138309e-308L)
+#endif
+
+#endif /* LIBAV_COMPAT_BSD_LIMITS_H */
diff --git a/configure b/configure
index 84ee548..8990f35 100755
--- a/configure
+++ b/configure
@@ -3159,6 +3159,7 @@ case $target_os in
         disable symver
         oss_indev_extralibs="-lossaudio"
         oss_outdev_extralibs="-lossaudio"
+        add_cppflags '-I\$(SRC_PATH)/compat/bsd'
         ;;
     openbsd|bitrig)
         disable symver
@@ -3167,6 +3168,7 @@ case $target_os in
         SLIB_INSTALL_LINKS=
         oss_indev_extralibs="-lossaudio"
         oss_outdev_extralibs="-lossaudio"
+        add_cppflags '-I\$(SRC_PATH)/compat/bsd'
         ;;
     dragonfly)
         disable symver
-- 
1.7.10.4



More information about the libav-devel mailing list