diff options
Diffstat (limited to 'cmake/snap-glib-base.patch')
| -rw-r--r-- | cmake/snap-glib-base.patch | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/cmake/snap-glib-base.patch b/cmake/snap-glib-base.patch index 42fcb41..669f797 100644 --- a/cmake/snap-glib-base.patch +++ b/cmake/snap-glib-base.patch | |||
| @@ -1,6 +1,19 @@ | |||
| 1 | --- a/glib-core/base.h | 1 | --- a/glib-core/base.h |
| 2 | +++ b/glib-core/base.h | 2 | +++ b/glib-core/base.h |
| 3 | @@ -89,7 +89,7 @@ | 3 | @@ -66,7 +66,11 @@ |
| 4 | #include <dirent.h> | ||
| 5 | #include <unistd.h> | ||
| 6 | #include <signal.h> | ||
| 7 | - #include <sys/poll.h> | ||
| 8 | + #if defined(SNAP_HAVE_POLL_H) | ||
| 9 | + #include <poll.h> | ||
| 10 | + #elif defined(SNAP_HAVE_SYS_POLL_H) | ||
| 11 | + #include <sys/poll.h> | ||
| 12 | + #endif | ||
| 13 | #include <sys/socket.h> | ||
| 14 | #include <sys/stat.h> | ||
| 15 | #include <sys/time.h> | ||
| 16 | @@ -89,7 +93,7 @@ | ||
| 4 | #define GLib_32Bit | 17 | #define GLib_32Bit |
| 5 | #elif __WORDSIZE == 64 || defined(GLib_WIN64) || defined(__CYGWIN64__) | 18 | #elif __WORDSIZE == 64 || defined(GLib_WIN64) || defined(__CYGWIN64__) |
| 6 | #define GLib_64Bit | 19 | #define GLib_64Bit |
| @@ -9,7 +22,7 @@ | |||
| 9 | #error "Undefined word size" | 22 | #error "Undefined word size" |
| 10 | #endif | 23 | #endif |
| 11 | 24 | ||
| 12 | @@ -98,10 +98,8 @@ | 25 | @@ -98,10 +102,8 @@ |
| 13 | #if defined(GLib_MACOSX) | 26 | #if defined(GLib_MACOSX) |
| 14 | #include <crt_externs.h> | 27 | #include <crt_externs.h> |
| 15 | #define _environ (*_NSGetEnviron()) | 28 | #define _environ (*_NSGetEnviron()) |
