[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / gio / gunixinputstream.h

diff --git a/gio/gunixinputstream.h b/gio/gunixinputstream.h
index 0a63227..8633051 100644 (file)
--- a/gio/gunixinputstream.h
+++ b/gio/gunixinputstream.h
@@ -1,5 +1,5 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
+ *
  * Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
@@ -23,7 +21,7 @@
 #ifndef __G_UNIX_INPUT_STREAM_H__
 #define __G_UNIX_INPUT_STREAM_H__
 
-#include <gio/ginputstream.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
@@ -36,7 +34,7 @@ G_BEGIN_DECLS
 
 /**
  * GUnixInputStream:
- * 
+ *
  * Implements #GInputStream for reading from selectable unix file descriptors
  **/
 typedef struct _GUnixInputStream         GUnixInputStream;
@@ -45,7 +43,7 @@ typedef struct _GUnixInputStreamPrivate  GUnixInputStreamPrivate;
 
 struct _GUnixInputStream
 {
-  GInputStream parent;
+  GInputStream parent_instance;
 
   /*< private >*/
   GUnixInputStreamPrivate *priv;
@@ -64,10 +62,19 @@ struct _GUnixInputStreamClass
   void (*_g_reserved5) (void);
 };
 
-GType g_unix_input_stream_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+GType          g_unix_input_stream_get_type     (void) G_GNUC_CONST;
 
-GInputStream *g_unix_input_stream_new (int fd,
-                                      gboolean close_fd_at_close);
+GLIB_AVAILABLE_IN_ALL
+GInputStream * g_unix_input_stream_new          (gint              fd,
+                                                 gboolean          close_fd);
+GLIB_AVAILABLE_IN_ALL
+void           g_unix_input_stream_set_close_fd (GUnixInputStream *stream,
+                                                 gboolean          close_fd);
+GLIB_AVAILABLE_IN_ALL
+gboolean       g_unix_input_stream_get_close_fd (GUnixInputStream *stream);
+GLIB_AVAILABLE_IN_ALL
+gint           g_unix_input_stream_get_fd       (GUnixInputStream *stream);
 
 G_END_DECLS