diff mbox

[4/7] tools: Update sys/poll.h to poll.h

Message ID 1481928967-4130-5-git-send-email-alistair.francis@xilinx.com (mailing list archive)
State New, archived
Headers show

Commit Message

Alistair Francis Dec. 16, 2016, 10:56 p.m. UTC 
To avoid this build error with newer build systems:
  error: #warning redirecting incorrect #include <sys/poll.h> to
         <poll.h> [-Werror=cpp]

Rename sys/poll.h to poll.h

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---
 tools/libxl/libxl_internal.h               | 2 +-
 tools/tests/xen-access/xen-access.c        | 2 +-
 tools/xenstat/libxenstat/src/xenstat_qmp.c | 2 +-
 tools/xentrace/xentrace.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Comments

Konrad Rzeszutek Wilk Dec. 17, 2016, 3:55 p.m. UTC | #1 
On Fri, Dec 16, 2016 at 02:56:04PM -0800, Alistair Francis wrote:
> To avoid this build error with newer build systems:

And what is newer? GCC 5? 6?

Thanks.
>   error: #warning redirecting incorrect #include <sys/poll.h> to
>          <poll.h> [-Werror=cpp]
> 
> Rename sys/poll.h to poll.h
> 
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> ---
>  tools/libxl/libxl_internal.h               | 2 +-
>  tools/tests/xen-access/xen-access.c        | 2 +-
>  tools/xenstat/libxenstat/src/xenstat_qmp.c | 2 +-
>  tools/xentrace/xentrace.c                  | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
> index 5f46578..acf9ac2 100644
> --- a/tools/libxl/libxl_internal.h
> +++ b/tools/libxl/libxl_internal.h
> @@ -38,7 +38,7 @@
>  #include <ctype.h>
>  
>  #include <sys/mman.h>
> -#include <sys/poll.h>
> +#include <poll.h>
>  #include <sys/select.h>
>  #include <sys/stat.h>
>  #include <sys/time.h>
> diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
> index 9d4f957..887bcd9 100644
> --- a/tools/tests/xen-access/xen-access.c
> +++ b/tools/tests/xen-access/xen-access.c
> @@ -36,7 +36,7 @@
>  #include <signal.h>
>  #include <unistd.h>
>  #include <sys/mman.h>
> -#include <sys/poll.h>
> +#include <poll.h>
>  
>  #include <xenctrl.h>
>  #include <xenevtchn.h>
> diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/xenstat/libxenstat/src/xenstat_qmp.c
> index a87c937..3fda487 100644
> --- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
> +++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
> @@ -14,7 +14,7 @@
>  #include <fcntl.h>
>  #include <sys/types.h>
>  #include <sys/socket.h>
> -#include <sys/poll.h>
> +#include <poll.h>
>  #include <sys/un.h>
>  #include <stdlib.h>
>  #include <string.h>
> diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
> index f09fe6c..364a6fd 100644
> --- a/tools/xentrace/xentrace.c
> +++ b/tools/xentrace/xentrace.c
> @@ -24,7 +24,7 @@
>  #include <getopt.h>
>  #include <assert.h>
>  #include <ctype.h>
> -#include <sys/poll.h>
> +#include <poll.h>
>  #include <sys/statvfs.h>
>  
>  #include <xen/xen.h>
> -- 
> 2.7.4
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> https://lists.xen.org/xen-devel
Alistair Francis Dec. 19, 2016, 6:01 p.m. UTC | #2 
On Sat, Dec 17, 2016 at 7:55 AM, Konrad Rzeszutek Wilk
<konrad.wilk@oracle.com> wrote:
> On Fri, Dec 16, 2016 at 02:56:04PM -0800, Alistair Francis wrote:
>> To avoid this build error with newer build systems:
>
> And what is newer? GCC 5? 6?

In this case it is GCC 5.

Thanks,

Alistair

>
> Thanks.
>>   error: #warning redirecting incorrect #include <sys/poll.h> to
>>          <poll.h> [-Werror=cpp]
>>
>> Rename sys/poll.h to poll.h
>>
>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
>> ---
>>  tools/libxl/libxl_internal.h               | 2 +-
>>  tools/tests/xen-access/xen-access.c        | 2 +-
>>  tools/xenstat/libxenstat/src/xenstat_qmp.c | 2 +-
>>  tools/xentrace/xentrace.c                  | 2 +-
>>  4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
>> index 5f46578..acf9ac2 100644
>> --- a/tools/libxl/libxl_internal.h
>> +++ b/tools/libxl/libxl_internal.h
>> @@ -38,7 +38,7 @@
>>  #include <ctype.h>
>>
>>  #include <sys/mman.h>
>> -#include <sys/poll.h>
>> +#include <poll.h>
>>  #include <sys/select.h>
>>  #include <sys/stat.h>
>>  #include <sys/time.h>
>> diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
>> index 9d4f957..887bcd9 100644
>> --- a/tools/tests/xen-access/xen-access.c
>> +++ b/tools/tests/xen-access/xen-access.c
>> @@ -36,7 +36,7 @@
>>  #include <signal.h>
>>  #include <unistd.h>
>>  #include <sys/mman.h>
>> -#include <sys/poll.h>
>> +#include <poll.h>
>>
>>  #include <xenctrl.h>
>>  #include <xenevtchn.h>
>> diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/xenstat/libxenstat/src/xenstat_qmp.c
>> index a87c937..3fda487 100644
>> --- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
>> +++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
>> @@ -14,7 +14,7 @@
>>  #include <fcntl.h>
>>  #include <sys/types.h>
>>  #include <sys/socket.h>
>> -#include <sys/poll.h>
>> +#include <poll.h>
>>  #include <sys/un.h>
>>  #include <stdlib.h>
>>  #include <string.h>
>> diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
>> index f09fe6c..364a6fd 100644
>> --- a/tools/xentrace/xentrace.c
>> +++ b/tools/xentrace/xentrace.c
>> @@ -24,7 +24,7 @@
>>  #include <getopt.h>
>>  #include <assert.h>
>>  #include <ctype.h>
>> -#include <sys/poll.h>
>> +#include <poll.h>
>>  #include <sys/statvfs.h>
>>
>>  #include <xen/xen.h>
>> --
>> 2.7.4
>>
>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xen.org
>> https://lists.xen.org/xen-devel
Douglas Goldstein Dec. 20, 2016, 4 a.m. UTC | #3 
On 12/19/16 12:01 PM, Alistair Francis wrote:
> On Sat, Dec 17, 2016 at 7:55 AM, Konrad Rzeszutek Wilk
> <konrad.wilk@oracle.com> wrote:
>> On Fri, Dec 16, 2016 at 02:56:04PM -0800, Alistair Francis wrote:
>>> To avoid this build error with newer build systems:
>>
>> And what is newer? GCC 5? 6?
> 
> In this case it is GCC 5.
> 

No. Its a libc thing. I wonder what libc you're using because glibc 2.24
still has it at sys/pool.h for me.
Alistair Francis Dec. 20, 2016, 5:44 p.m. UTC | #4 
On Mon, Dec 19, 2016 at 8:00 PM, Doug Goldstein <cardoe@cardoe.com> wrote:
> On 12/19/16 12:01 PM, Alistair Francis wrote:
>> On Sat, Dec 17, 2016 at 7:55 AM, Konrad Rzeszutek Wilk
>> <konrad.wilk@oracle.com> wrote:
>>> On Fri, Dec 16, 2016 at 02:56:04PM -0800, Alistair Francis wrote:
>>>> To avoid this build error with newer build systems:
>>>
>>> And what is newer? GCC 5? 6?
>>
>> In this case it is GCC 5.
>>
>
> No. Its a libc thing. I wonder what libc you're using because glibc 2.24
> still has it at sys/pool.h for me.

Yeah, you are right. I don't know what I was thinking.

I'm using musl version 1.1.15 which prints a warning every time you
call sys/poll.h.

Looking at the latest glibc master branch glibc supports both and
doesn't have any warnings. This probably isn't the right thing to do
then. I will just have to remove Werror instead.

Thanks,

Alistair

>
> --
> Doug Goldstein
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> https://lists.xen.org/xen-devel
>
diff mbox

Patch

diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 5f46578..acf9ac2 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -38,7 +38,7 @@ 
 #include <ctype.h>
 
 #include <sys/mman.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
index 9d4f957..887bcd9 100644
--- a/tools/tests/xen-access/xen-access.c
+++ b/tools/tests/xen-access/xen-access.c
@@ -36,7 +36,7 @@ 
 #include <signal.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include <xenctrl.h>
 #include <xenevtchn.h>
diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/xenstat/libxenstat/src/xenstat_qmp.c
index a87c937..3fda487 100644
--- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
+++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
@@ -14,7 +14,7 @@ 
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/un.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
index f09fe6c..364a6fd 100644
--- a/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@ -24,7 +24,7 @@ 
 #include <getopt.h>
 #include <assert.h>
 #include <ctype.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/statvfs.h>
 
 #include <xen/xen.h>