From d4e81f9ec8273914739808737fa0a27a3f0589fb Mon Sep 17 00:00:00 2001 From: Eric Haszlakiewicz Date: Sat, 3 May 2014 22:29:10 -0400 Subject: Move the json_min() and json_max() macros to json_util.h and mark everything else in bits.h deprecated. Eliminate all uses of bits.h within the json-c code. --- json_util.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'json_util.h') diff --git a/json_util.h b/json_util.h index 1005e58..387dbc4 100644 --- a/json_util.h +++ b/json_util.h @@ -14,6 +14,15 @@ #include "json_object.h" +#ifndef json_min +#define json_min(a,b) ((a) < (b) ? (a) : (b)) +#endif + +#ifndef json_max +#define json_max(a,b) ((a) > (b) ? (a) : (b)) +#endif + + #ifdef __cplusplus extern "C" { #endif -- cgit v1.2.1