Add MIN/MAX declarations in nfc-internal.h and nfc-utils.h

Remove the now useless #include <sys/param.h>

libnfc/buses/uart_posix.c

@@ -28,7 +28,6 @@
 /* vim: set ts=2 sw=2 et: */
 
 #include <sys/ioctl.h>
-#include <sys/param.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>

libnfc/chips/pn53x.c

@@ -35,8 +35,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <sys/param.h>
-
 #include "nfc/nfc.h"
 #include "nfc-internal.h"
 #include "pn53x.h"

libnfc/drivers/acr122s.c

@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>
-#include <sys/param.h>
 #include <string.h>
 #include <unistd.h>
 

libnfc/drivers/arygon.c

@@ -38,7 +38,6 @@
 #include <stdio.h>
 #include <inttypes.h>
 #include <string.h>
-#include <sys/param.h>
 #include <string.h>
 #include <unistd.h>
 

libnfc/nfc-internal.h

@@ -45,6 +45,13 @@
     return false; \
   }
 
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
 /*
  * Buffer management macros.
  * 

libnfc/nfc.c

@@ -78,8 +78,6 @@
 #include "nfc-internal.h"
 #include "drivers.h"
 
-#include <sys/param.h>
-
 #define LOG_CATEGORY "libnfc.general"
 
 const struct nfc_driver *nfc_drivers[] = {

utils/nfc-list.c

@@ -39,7 +39,6 @@
 
 #ifdef HAVE_LIBUSB
 #  ifdef DEBUG
-#    include <sys/param.h>
 #    include <usb.h>
 #  endif
 #endif

utils/nfc-probe.c

@@ -39,7 +39,6 @@
 
 #ifdef HAVE_LIBUSB
 #  ifdef DEBUG
-#    include <sys/param.h>
 #    include <usb.h>
 #  endif
 #endif

utils/nfc-read-forum-tag3.c

@@ -49,7 +49,6 @@
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
-#include <sys/param.h>
 #include <unistd.h>
 
 #include <nfc/nfc.h>

utils/nfc-utils.h

@@ -79,6 +79,13 @@
 #  define ERR(...)  warnx ("ERROR: " __VA_ARGS__ )
 #endif
 
+#ifndef MIN
+#define MIN(a,b) (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a,b) (((a) > (b)) ? (a) : (b))
+#endif
+
 uint8_t  oddparity (const uint8_t bt);
 void    oddparity_bytes_ts (const uint8_t *pbtData, const size_t szLen, uint8_t *pbtPar);