[PATCH 04/13] tools: Fix compilation errors with musl

Linux bluetooth development
 help / color / mirror / Atom feed

From: Szymon Janc <szymon.janc@tieto.com>
To: linux-bluetooth@vger.kernel.org
Cc: Szymon Janc <szymon.janc@tieto.com>
Subject: [PATCH 04/13] tools: Fix compilation errors  with musl
Date: Fri, 19 Sep 2014 16:10:07 +0200	[thread overview]
Message-ID: <1411135816-18966-5-git-send-email-szymon.janc@tieto.com> (raw)
In-Reply-To: <1411135816-18966-1-git-send-email-szymon.janc@tieto.com>

This fix number of includes for <sys/poll.h> instead of <poll.h>

  CC       tools/hciattach.o
In file included from tools/hciattach.c:41:0:
/usr/include/sys/poll.h:1:2: error: #warning redirecting incorrect
   #include <sys/poll.h> to <poll.h> [-Werror=cpp]
 #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
  ^
---
 tools/amptest.c            | 2 +-
 tools/btattach.c           | 2 +-
 tools/btsnoop.c            | 1 +
 tools/ciptool.c            | 2 +-
 tools/cltest.c             | 2 +-
 tools/hciattach.c          | 2 +-
 tools/hciattach_qualcomm.c | 2 +-
 tools/hciattach_tialt.c    | 2 +-
 tools/hcidump.c            | 2 +-
 tools/l2ping.c             | 2 +-
 tools/l2test.c             | 2 +-
 tools/rfcomm.c             | 2 +-
 12 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tools/amptest.c b/tools/amptest.c
index 6192f7e..bba0a9a 100644
--- a/tools/amptest.c
+++ b/tools/amptest.c
@@ -32,7 +32,7 @@
 #include <alloca.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
diff --git a/tools/btattach.c b/tools/btattach.c
index 9458fd7..bdbbe16 100644
--- a/tools/btattach.c
+++ b/tools/btattach.c
@@ -35,7 +35,7 @@
 #include <getopt.h>
 #include <termios.h>
 #include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
diff --git a/tools/btsnoop.c b/tools/btsnoop.c
index 14581f2..71191eb 100644
--- a/tools/btsnoop.c
+++ b/tools/btsnoop.c
@@ -35,6 +35,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <getopt.h>
+#include <endian.h>
 #include <arpa/inet.h>
 #include <sys/stat.h>
 
diff --git a/tools/ciptool.c b/tools/ciptool.c
index 72338dc..3ff9fb1 100644
--- a/tools/ciptool.c
+++ b/tools/ciptool.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <getopt.h>
 #include <signal.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
diff --git a/tools/cltest.c b/tools/cltest.c
index 4ddb98a..0231805 100644
--- a/tools/cltest.c
+++ b/tools/cltest.c
@@ -32,7 +32,7 @@
 #include <alloca.h>
 #include <stdlib.h>
 #include <stdbool.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
diff --git a/tools/hciattach.c b/tools/hciattach.c
index 1904ac5..d8ef7e7 100644
--- a/tools/hciattach.c
+++ b/tools/hciattach.c
@@ -37,8 +37,8 @@
 #include <syslog.h>
 #include <termios.h>
 #include <time.h>
+#include <poll.h>
 #include <sys/time.h>
-#include <sys/poll.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 
diff --git a/tools/hciattach_qualcomm.c b/tools/hciattach_qualcomm.c
index eb72a0f..0e25905 100644
--- a/tools/hciattach_qualcomm.c
+++ b/tools/hciattach_qualcomm.c
@@ -36,8 +36,8 @@
 #include <syslog.h>
 #include <termios.h>
 #include <time.h>
+#include <poll.h>
 #include <sys/time.h>
-#include <sys/poll.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
diff --git a/tools/hciattach_tialt.c b/tools/hciattach_tialt.c
index 5c7f3a5..a7c1706 100644
--- a/tools/hciattach_tialt.c
+++ b/tools/hciattach_tialt.c
@@ -35,8 +35,8 @@
 #include <syslog.h>
 #include <termios.h>
 #include <time.h>
+#include <poll.h>
 #include <sys/time.h>
-#include <sys/poll.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
diff --git a/tools/hcidump.c b/tools/hcidump.c
index 37a9f00..8839eb0 100644
--- a/tools/hcidump.c
+++ b/tools/hcidump.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/tools/l2ping.c b/tools/l2ping.c
index 29fb3d0..3dd437e 100644
--- a/tools/l2ping.c
+++ b/tools/l2ping.c
@@ -35,7 +35,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include <sys/time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/tools/l2test.c b/tools/l2test.c
index 67ca70a..71ad109 100644
--- a/tools/l2test.c
+++ b/tools/l2test.c
@@ -38,7 +38,7 @@
 #include <syslog.h>
 #include <signal.h>
 #include <sys/time.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
diff --git a/tools/rfcomm.c b/tools/rfcomm.c
index b5bea38..659bbec 100644
--- a/tools/rfcomm.c
+++ b/tools/rfcomm.c
@@ -34,7 +34,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include <termios.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
-- 
1.9.3

next prev parent reply	other threads:[~2014-09-19 14:10 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-19 14:10 [PATCH 00/13] Compilation with musl C library Szymon Janc
2014-09-19 14:10 ` [PATCH 01/13] sap: Fix compilation errors with musl Szymon Janc
2014-09-19 14:10 ` [PATCH 02/13] lib: Fix compilation error " Szymon Janc
2014-09-19 14:10 ` [PATCH 03/13] android/hal-audio: Fix compilation errors " Szymon Janc
2014-09-19 14:10 ` Szymon Janc [this message]
2014-09-19 14:10 ` [PATCH 05/13] shared: " Szymon Janc
2014-09-19 14:10 ` [PATCH 06/13] alert: Fix compilation error " Szymon Janc
2014-09-19 14:10 ` [PATCH 07/13] core: " Szymon Janc
2014-09-19 14:10 ` [PATCH 08/13] obexd: " Szymon Janc
2014-09-19 14:10 ` [PATCH 09/13] android/pan: " Szymon Janc
2014-09-19 14:10 ` [PATCH 10/13] android/client: Fix compilation errors " Szymon Janc
2014-09-19 14:10 ` [PATCH 11/13] health: Use proper type for tid Szymon Janc
2014-09-19 14:10 ` [PATCH 12/13] emulator: Fix compilation error with musl Szymon Janc
2014-09-19 14:10 ` [PATCH 13/13] android/emulator: " Szymon Janc
2014-09-24 18:33 ` [PATCH 00/13] Compilation with musl C library Johan Hedberg

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6192f7e dfblob:bba0a9a dfblob:9458fd7 dfblob:bdbbe16
dfblob:14581f2 dfblob:71191eb dfblob:72338dc dfblob:3ff9fb1
dfblob:4ddb98a dfblob:0231805 dfblob:1904ac5 dfblob:d8ef7e7
dfblob:eb72a0f dfblob:0e25905 dfblob:5c7f3a5 dfblob:a7c1706
dfblob:37a9f00 dfblob:8839eb0 dfblob:29fb3d0 dfblob:3dd437e
dfblob:67ca70a dfblob:71ad109 dfblob:b5bea38 dfblob:659bbec )
 OR (
bs:"[PATCH 04/13] tools: Fix compilation errors  with musl" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411135816-18966-5-git-send-email-szymon.janc@tieto.com \
    --to=szymon.janc@tieto.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox