diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2013-01-31 10:06:16 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-01-31 10:09:23 +0100 |
| commit | fb7664e2995f2b5bed4b93c7c82aab14c2485eb8 (patch) | |
| tree | c7e0734ef812065f6deff14139aa8097364ed69b /tools | |
| parent | e5103c0f2c4b50ade5967b81f57edfb5730ef59d (diff) | |
| download | neard-fb7664e2995f2b5bed4b93c7c82aab14c2485eb8.tar.gz neard-fb7664e2995f2b5bed4b93c7c82aab14c2485eb8.tar.bz2 neard-fb7664e2995f2b5bed4b93c7c82aab14c2485eb8.zip | |
include: Add a copy of the NFC kernel header
With the netlink kernel API changes, including a copy of the NFC header and
not relying on the system one will allow clean builds. The drawback could
be missing runtime features but that's better than not being able to run
the daemon at all.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/nfctool/llcp-decode.c | 3 | ||||
| -rw-r--r-- | tools/nfctool/main.c | 3 | ||||
| -rw-r--r-- | tools/nfctool/netlink.c | 3 | ||||
| -rw-r--r-- | tools/nfctool/sniffer.c | 3 | ||||
| -rw-r--r-- | tools/snep-send.c | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/tools/nfctool/llcp-decode.c b/tools/nfctool/llcp-decode.c index 9ffc218..30f9aa9 100644 --- a/tools/nfctool/llcp-decode.c +++ b/tools/nfctool/llcp-decode.c @@ -23,9 +23,10 @@ #include <errno.h> #include <string.h> #include <netdb.h> -#include <linux/nfc.h> #include <sys/time.h> +#include <near/nfc_copy.h> + #include "nfctool.h" #include "sniffer.h" #include "llcp-decode.h" diff --git a/tools/nfctool/main.c b/tools/nfctool/main.c index 8906508..1948e7f 100644 --- a/tools/nfctool/main.c +++ b/tools/nfctool/main.c @@ -24,9 +24,10 @@ #include <errno.h> #include <string.h> #include <sys/socket.h> -#include <linux/nfc.h> #include <glib.h> +#include <near/nfc_copy.h> + #include "nfctool.h" #include "netlink.h" #include "sniffer.h" diff --git a/tools/nfctool/netlink.c b/tools/nfctool/netlink.c index aaa0641..cded411 100644 --- a/tools/nfctool/netlink.c +++ b/tools/nfctool/netlink.c @@ -25,7 +25,6 @@ #include <errno.h> #include <sys/socket.h> -#include <linux/nfc.h> #include <netlink/netlink.h> #include <netlink/genl/genl.h> @@ -34,6 +33,8 @@ #include <glib.h> +#include <near/nfc_copy.h> + #include "nfctool.h" #include "netlink.h" diff --git a/tools/nfctool/sniffer.c b/tools/nfctool/sniffer.c index 2a8d176..a1a79d6 100644 --- a/tools/nfctool/sniffer.c +++ b/tools/nfctool/sniffer.c @@ -32,10 +32,11 @@ #include <arpa/inet.h> #include <linux/tcp.h> #include <linux/ip.h> -#include <linux/nfc.h> #include <errno.h> #include <glib.h> +#include <near/nfc_copy.h> + #include "nfctool.h" #include "llcp-decode.h" #include "sniffer.h" diff --git a/tools/snep-send.c b/tools/snep-send.c index 1921ad2..8d9aa64 100644 --- a/tools/snep-send.c +++ b/tools/snep-send.c @@ -8,8 +8,8 @@ #include <sys/socket.h> #include <linux/socket.h> -#include <linux/nfc.h> +#include <near/nfc_copy.h> #include <near/types.h> #include <near/ndef.h> |