luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-19 16:56:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up platform-specific includes

Browse Source 
The problem was pointed out in bug 618029. To solve it, we moved
the GUnixFDList typedef to giotypes.h.
This commit is contained in:
Matthias Clasen 2010-05-13 20:29:04 -04:00
parent dd3551e7c3
commit 8f89b63930
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdbusmessage.c
View File

@ -38,6 +38,8 @@
#include "gioerror.h"
#ifdef G_OS_UNIX
#include "gunixfdlist.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>

6
gio/gdbusmessage.h
View File

@ -25,10 +25,6 @@
#include <gio/giotypes.h>
#ifdef G_OS_UNIX
#include <gio/gunixfdlist.h>
#endif
G_BEGIN_DECLS
#define G_TYPE_DBUS_MESSAGE (g_dbus_message_get_type ())
@ -111,11 +107,9 @@ guchar *g_dbus_message_get_header_fields (GDBusMessage
GVariant *g_dbus_message_get_body (GDBusMessage *message);
void g_dbus_message_set_body (GDBusMessage *message,
GVariant *body);
#ifdef G_OS_UNIX
GUnixFDList *g_dbus_message_get_unix_fd_list (GDBusMessage *message);
void g_dbus_message_set_unix_fd_list (GDBusMessage *message,
GUnixFDList *fd_list);
#endif
guint32 g_dbus_message_get_reply_serial (GDBusMessage *message);
void g_dbus_message_set_reply_serial (GDBusMessage *message,

1
gio/giotypes.h
View File

@ -335,6 +335,7 @@ struct _GOutputVector {
typedef struct _GCredentials GCredentials;
typedef struct _GUnixCredentialsMessage GUnixCredentialsMessage;
typedef struct _GUnixFDList GUnixFDList;
typedef struct _GDBusMessage GDBusMessage;
typedef struct _GDBusConnection GDBusConnection;
typedef struct _GMessageBusConnection GMessageBusConnection;

3
gio/gunixfdlist.h
View File

@ -23,7 +23,7 @@
#ifndef __G_UNIX_FD_LIST_H__
#define __G_UNIX_FD_LIST_H__
#include <glib-object.h>
#include <gio/gio.h>
G_BEGIN_DECLS
@ -41,7 +41,6 @@ G_BEGIN_DECLS
typedef struct _GUnixFDListPrivate GUnixFDListPrivate;
typedef struct _GUnixFDListClass GUnixFDListClass;
typedef struct _GUnixFDList GUnixFDList;
struct _GUnixFDListClass
{

1
gio/gunixfdmessage.c
View File

@ -39,6 +39,7 @@
#include <errno.h>
#include "gunixfdmessage.h"
#include "gunixfdlist.h"
#include "gioerror.h"
#include "gioalias.h"

2
gio/gunixfdmessage.h
View File

@ -23,8 +23,8 @@
#ifndef __G_UNIX_FD_MESSAGE_H__
#define __G_UNIX_FD_MESSAGE_H__
#include <gio/gunixfdlist.h>
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
G_BEGIN_DECLS

1
gio/tests/gdbus-example-unix-fd-client.c
View File

@ -7,6 +7,7 @@
#include <time.h>
#include <gio/gio.h>
#include <gio/gunixfdlist.h>
/* see gdbus-example-server.c for the server implementation */
static gint

1
gio/tests/gdbus-peer.c
View File

@ -30,6 +30,7 @@
#include <fcntl.h>
#include <gio/gunixsocketaddress.h>
#include <gio/gunixfdlist.h>
#include "gdbus-tests.h"