comparison: glib/glib.patch
glib/glib.patch
- changeset 660
- eb7d0eac7ab8
- parent 454
- e99334bd789c
- child 769
- a0926cc92e0c
equal
deleted
inserted
replaced
| 1:d86b3f718c2e | 2:80d78fe238c1 |
|---|---|
| 139 + return RTLD_DEFAULT; | 139 + return RTLD_DEFAULT; |
| 140 +#endif | 140 +#endif |
| 141 } | 141 } |
| 142 | 142 |
| 143 static void | 143 static void |
| 144 diff -Nau gio/gsocket.c.orig gio/gsocket.c | |
| 145 Index: gio/gsocket.c | |
| 146 --- gio/gsocket.c.orig 2012-08-03 11:38:08.419548195 +0200 | |
| 147 +++ gio/gsocket.c 2012-08-03 11:38:11.307357875 +0200 | |
| 148 @@ -48,6 +48,10 @@ | |
| 149 #include <sys/uio.h> | |
| 150 #endif | |
| 151 | |
| 152 +#if defined (__SVR4) && defined (__sun) | |
| 153 +#include <sys/filio.h> | |
| 154 +#endif | |
| 155 + | |
| 156 #include "gcancellable.h" | |
| 157 #include "gioenumtypes.h" | |
| 158 #include "ginetaddress.h" | |
| 159 diff -Nau gio/gresource-tool.c.orig gio/gresource-tool.c | |
| 160 Index: gio/gresource-tool.c | |
| 161 --- gio/gresource-tool.c.orig 2012-08-03 11:25:31.632225248 +0200 | |
| 162 +++ gio/gresource-tool.c 2012-08-03 11:38:12.657797557 +0200 | |
| 163 @@ -31,6 +31,11 @@ | |
| 164 #include <locale.h> | |
| 165 | |
| 166 #ifdef HAVE_LIBELF | |
| 167 +/* Solaris libelf does not support largefile in 32-bit mode */ | |
| 168 +#if defined (__SVR4) && defined (__sun) && defined (__i386) | |
| 169 +#undef _FILE_OFFSET_BITS | |
| 170 +#define _FILE_OFFSET_BITS 32 | |
| 171 +#endif | |
| 172 #include <libelf.h> | |
| 173 #include <gelf.h> | |
| 174 #include <sys/mman.h> |
