summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-14 13:21:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:23:06 -0500
commit1329c2eb1fd9d6c8180e694f039f07fcab59f9b0 (patch)
treebe3a5e36d9b8698eca7b141504b3500b32cfc32d /source4/lib
parent61b16caed8b0ae4ffbbbabfc007a6e3c19b39227 (diff)
downloadsamba-1329c2eb1fd9d6c8180e694f039f07fcab59f9b0.tar.gz
samba-1329c2eb1fd9d6c8180e694f039f07fcab59f9b0.tar.bz2
samba-1329c2eb1fd9d6c8180e694f039f07fcab59f9b0.zip
r8467: using both math.h and float.h breaks popt on freebsd 5.4
(This used to be commit a1acb3300eec7717df24ecdf7205fb4e395d8c16)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/popt/popt.c5
1 files changed, 3 insertions, 2 deletions
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"