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

Remove the now useless #include <sys/param.h>
This commit is contained in:
Ludovic Rousseau 2012-05-13 19:15:44 +00:00
parent a14ec0cbaa
commit 59d47bc7da
10 changed files with 14 additions and 10 deletions

View file

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

View file

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

View file

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

View file

@ -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);