diff options
author | Matthias Clasen <mclasen@redhat.com> | 2010-05-13 23:08:34 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-13 23:08:34 -0400 |
commit | 6223341cacc7dfa34a8d60ec1b4828382dee6d07 (patch) | |
tree | 9969de8c5b3c6fb2307f197a47a9ff4f6a48a728 /gio/gunixfdmessage.c | |
parent | a7c4c7de58a48c179e4dc3336814f63c33ad07ff (diff) | |
parent | 6e8637e4783ae4e573f6784f005920930d9fca87 (diff) | |
download | glib-6223341cacc7dfa34a8d60ec1b4828382dee6d07.tar.gz |
Merge branch 'gdbus-merge'
Conflicts:
docs/reference/gio/gio-docs.xml
docs/reference/gio/gio-sections.txt
gio/tests/Makefile.am
Diffstat (limited to 'gio/gunixfdmessage.c')
-rw-r--r-- | gio/gunixfdmessage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gio/gunixfdmessage.c b/gio/gunixfdmessage.c index 90f87c34b..9d3fa442c 100644 --- a/gio/gunixfdmessage.c +++ b/gio/gunixfdmessage.c @@ -44,6 +44,7 @@ #include <errno.h> #include "gunixfdmessage.h" +#include "gunixfdlist.h" #include "gioerror.h" #include "gioalias.h" |