summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-24 14:09:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:16 -0500
commite2e3a8e007ac2a9533f4205622a6e17d57845fcc (patch)
tree1480089739669eabb9cdd75f800b1a922a419f88 /source4/lib
parentd6687d1b87bffb1079ded20cc31e4a507f551b44 (diff)
downloadsamba-e2e3a8e007ac2a9533f4205622a6e17d57845fcc.tar.gz
samba-e2e3a8e007ac2a9533f4205622a6e17d57845fcc.tar.bz2
samba-e2e3a8e007ac2a9533f4205622a6e17d57845fcc.zip
r15200: Move MIN/MAX macros to libreplace as some systems have them
in sys/param.h (This used to be commit 3f0396aade82a92a375275059baf8500de1b23f0)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/replace/README2
-rw-r--r--source4/lib/replace/config.m42
-rw-r--r--source4/lib/replace/replace.h14
-rw-r--r--source4/lib/util/util.h14
4 files changed, 18 insertions, 14 deletions
diff --git a/source4/lib/replace/README b/source4/lib/replace/README
index 841bcf4b8d..a3e9d87072 100644
--- a/source4/lib/replace/README
+++ b/source4/lib/replace/README
@@ -68,6 +68,8 @@ UINT64_MAX
Macros:
va_copy
__FUNCTION__
+MIN
+MAX
Prerequisites:
memset (for bzero)
diff --git a/source4/lib/replace/config.m4 b/source4/lib/replace/config.m4
index fb6e791353..ada9566b58 100644
--- a/source4/lib/replace/config.m4
+++ b/source4/lib/replace/config.m4
@@ -159,3 +159,5 @@ samba_cv_HAVE_FUNCTION_MACRO=yes,samba_cv_HAVE_FUNCTION_MACRO=no)])
if test x"$samba_cv_HAVE_FUNCTION_MACRO" = x"yes"; then
AC_DEFINE(HAVE_FUNCTION_MACRO,1,[Whether there is a __FUNCTION__ macro])
fi
+
+AC_CHECK_HEADERS([sys/param.h])
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h
index 814936c49f..218fd4cb2a 100644
--- a/source4/lib/replace/replace.h
+++ b/source4/lib/replace/replace.h
@@ -213,4 +213,18 @@ typedef bool int;
#define __FUNCTION__ ("")
#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#ifndef MIN
+#define MIN(a,b) ((a)<(b)?(a):(b))
+#endif
+
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
+
+
+
#endif
diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h
index 8a2a9163d6..302bd06323 100644
--- a/source4/lib/util/util.h
+++ b/source4/lib/util/util.h
@@ -77,20 +77,6 @@ extern const char *panic_action;
smb_panic("assert failed"); abort(); }} while (0)
/**
- * determine the lowest of two values
- */
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-
-/**
- * determine the highest of two values
- */
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
-/**
* determine absolute value
*/
#ifndef ABS