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

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

View file

@ -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"

View file

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

View file

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

View file

@ -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.
*

View file

@ -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[] = {