projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
63d74ca
)
Fix build on !linux
author
Matthias Clasen
<mclasen@redhat.com>
Sat, 15 May 2010 22:15:30 +0000
(18:15 -0400)
committer
Matthias Clasen
<mclasen@redhat.com>
Sat, 15 May 2010 22:16:51 +0000
(18:16 -0400)
Don't define __USE_GNU, thats a glibc-internal macro, and
don't use SOL_SOCKET when not including sys/socket.h.
Maybe this file should be called glinuxcredentialsmessage.c...
Bug #618730
gio/gunixcredentialsmessage.c
patch
|
blob
|
history
diff --git
a/gio/gunixcredentialsmessage.c
b/gio/gunixcredentialsmessage.c
index 15c4c96d338143b9dad41f82a8e654df3734bdd8..bb4ef0034035456d798d3bf883b2beea3423714b 100644
(file)
--- a/
gio/gunixcredentialsmessage.c
+++ b/
gio/gunixcredentialsmessage.c
@@
-36,7
+36,6
@@
#ifdef __linux__
#define _GNU_SOURCE
-#define __USE_GNU
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
@@
-86,7
+85,11
@@
g_unix_credentials_message_get_size (GSocketControlMessage *message)
static int
g_unix_credentials_message_get_level (GSocketControlMessage *message)
{
+#ifdef __linux__
return SOL_SOCKET;
+#else
+ return 0;
+#endif
}
static int