gpollableutils: utility functions for pollable stream implementations

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

diff --git a/gio/gpollableinputstream.h b/gio/gpollableinputstream.h
index 5def93b..49af7ee 100644 (file)
--- a/gio/gpollableinputstream.h
+++ b/gio/gpollableinputstream.h
@@ -18,6 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
 #ifndef __G_POLLABLE_INPUT_STREAM_H__
 #define __G_POLLABLE_INPUT_STREAM_H__
 
@@ -73,7 +77,7 @@ struct _GPollableInputStreamInterface
                                    GCancellable          *cancellable);
   gssize       (*read_nonblocking) (GPollableInputStream  *stream,
                                    void                  *buffer,
-                                   gsize                  size,
+                                   gsize                  count,
                                    GError               **error);
 };
 
@@ -87,13 +91,10 @@ GSource *g_pollable_input_stream_create_source    (GPollableInputStream  *stream
 
 gssize   g_pollable_input_stream_read_nonblocking (GPollableInputStream  *stream,
                                                   void                  *buffer,
-                                                  gsize                  size,
+                                                  gsize                  count,
                                                   GCancellable          *cancellable,
                                                   GError               **error);
 
-/* Helper method for stream implementations */
-GSource *g_pollable_source_new                    (GObject               *stream);
-
 G_END_DECLS