Attachment 75192 Details for Bug 61176 – Header fixes for QNX

[patch] Header fixes for QNX

0002-Header-fixes-for-QNX.patch (text/plain), 1.40 KB, created by Matt Fischer on 2013-02-20 17:31:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Fischer

Created: 2013-02-20 17:31:25 UTC

Size: 1.40 KB

patch

obsolete

>From 0fcc0b755199b65e442765a6319a789d8161ea29 Mon Sep 17 00:00:00 2001
>From: Matt Fischer <matt.fischer@garmin.com>
>Date: Mon, 4 Feb 2013 18:30:14 -0600
>Subject: [PATCH 2/3] Header fixes for QNX
>
>* QNX's copy of sys/inotify.h is broken, and doesn't include
>  stdint.h even though it refers to types from it.  Therefore,
>  it must be included manually.
>* There is no sys/fcntl.h on QNX, only fcntl.h.  Most places in
>  dbus already refer to the header from that location, so this
>  change fixes the single place in the code which does not.
>---
> bus/dir-watch-inotify.c | 4 ++++
> dbus/sd-daemon.c        | 2 +-
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
>index 2e9be98..67f938f 100644
>--- a/bus/dir-watch-inotify.c
>+++ b/bus/dir-watch-inotify.c
>@@ -27,6 +27,10 @@
> #include <stdlib.h>
> #include <unistd.h>
> #include <fcntl.h>
>+#ifdef __QNX__
>+/* QNX's inotify is broken, and requires stdint.h to be manually included first */
>+#include <stdint.h>
>+#endif
> #include <sys/inotify.h>
> #include <sys/types.h>
> #include <signal.h>
>diff --git a/dbus/sd-daemon.c b/dbus/sd-daemon.c
>index 9c23b91..8596961 100644
>--- a/dbus/sd-daemon.c
>+++ b/dbus/sd-daemon.c
>@@ -32,7 +32,7 @@
> #include <sys/stat.h>
> #include <sys/socket.h>
> #include <sys/un.h>
>-#include <sys/fcntl.h>
>+#include <fcntl.h>
> #include <netinet/in.h>
> #include <stdlib.h>
> #include <errno.h>
>-- 
>1.8.0.msysgit.0
>

Actions: View | Splinter Review

Attachments on bug 61176: 75191 | 75192 | 75198 | 75210 | 75211 | 75323

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.