From 1329c2eb1fd9d6c8180e694f039f07fcab59f9b0 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 14 Jul 2005 13:21:27 +0000
Subject: r8467: using both math.h and float.h breaks popt on freebsd 5.4 (This
 used to be commit a1acb3300eec7717df24ecdf7205fb4e395d8c16)

---
 source4/lib/popt/popt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/lib/popt')

diff --git a/source4/lib/popt/popt.c b/source4/lib/popt/popt.c
index eb81c720f5..253fe9c424 100644
--- a/source4/lib/popt/popt.c
+++ b/source4/lib/popt/popt.c
@@ -10,10 +10,11 @@
 
 #include "system.h"
 
-#if HAVE_FLOAT_H
+#if HAVE_MATH_H
+#include <math.h>
+#elif HAVE_FLOAT_H
 #include <float.h>
 #endif
-#include <math.h>
 
 #include "findme.h"
 #include "poptint.h"
-- 
cgit