projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Enable 'initial_read()' - is no longer needed
[platform/upstream/glib.git]
/
gio
/
gpollableinputstream.h
diff --git
a/gio/gpollableinputstream.h
b/gio/gpollableinputstream.h
index
3b57460
..
f0a97ea
100644
(file)
--- a/
gio/gpollableinputstream.h
+++ b/
gio/gpollableinputstream.h
@@
-13,14
+13,16
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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/>.
*/
#ifndef __G_POLLABLE_INPUT_STREAM_H__
#define __G_POLLABLE_INPUT_STREAM_H__
*/
#ifndef __G_POLLABLE_INPUT_STREAM_H__
#define __G_POLLABLE_INPUT_STREAM_H__
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
#include <gio/gio.h>
G_BEGIN_DECLS
#include <gio/gio.h>
G_BEGIN_DECLS
@@
-73,27
+75,29
@@
struct _GPollableInputStreamInterface
GCancellable *cancellable);
gssize (*read_nonblocking) (GPollableInputStream *stream,
void *buffer,
GCancellable *cancellable);
gssize (*read_nonblocking) (GPollableInputStream *stream,
void *buffer,
- gsize
size
,
+ gsize
count
,
GError **error);
};
GError **error);
};
+GLIB_AVAILABLE_IN_ALL
GType g_pollable_input_stream_get_type (void) G_GNUC_CONST;
GType g_pollable_input_stream_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
gboolean g_pollable_input_stream_can_poll (GPollableInputStream *stream);
gboolean g_pollable_input_stream_can_poll (GPollableInputStream *stream);
+GLIB_AVAILABLE_IN_ALL
gboolean g_pollable_input_stream_is_readable (GPollableInputStream *stream);
gboolean g_pollable_input_stream_is_readable (GPollableInputStream *stream);
+GLIB_AVAILABLE_IN_ALL
GSource *g_pollable_input_stream_create_source (GPollableInputStream *stream,
GCancellable *cancellable);
GSource *g_pollable_input_stream_create_source (GPollableInputStream *stream,
GCancellable *cancellable);
+GLIB_AVAILABLE_IN_ALL
gssize g_pollable_input_stream_read_nonblocking (GPollableInputStream *stream,
void *buffer,
gssize g_pollable_input_stream_read_nonblocking (GPollableInputStream *stream,
void *buffer,
- gsize
size
,
+ gsize
count
,
GCancellable *cancellable,
GError **error);
GCancellable *cancellable,
GError **error);
-/* Helper method for stream implementations */
-GSource *g_pollable_source_new (GObject *pollable_stream);
-
G_END_DECLS
G_END_DECLS