gdatainputstream.h		gdatainputstream.h
	skipping to change at line 43		skipping to change at line 43
	#define G_TYPE_DATA_INPUT_STREAM (g_data_input_stream_get_type ())		#define G_TYPE_DATA_INPUT_STREAM (g_data_input_stream_get_type ())
	#define G_DATA_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DATA_INPUT_STREAM, GDataInputStream))		#define G_DATA_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DATA_INPUT_STREAM, GDataInputStream))
	#define G_DATA_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TY PE_DATA_INPUT_STREAM, GDataInputStreamClass))		#define G_DATA_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TY PE_DATA_INPUT_STREAM, GDataInputStreamClass))
	#define G_IS_DATA_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DATA_INPUT_STREAM))		#define G_IS_DATA_INPUT_STREAM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DATA_INPUT_STREAM))
	#define G_IS_DATA_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_T YPE_DATA_INPUT_STREAM))		#define G_IS_DATA_INPUT_STREAM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_T YPE_DATA_INPUT_STREAM))
	#define G_DATA_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G _TYPE_DATA_INPUT_STREAM, GDataInputStreamClass))		#define G_DATA_INPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G _TYPE_DATA_INPUT_STREAM, GDataInputStreamClass))
	/**		/**
	* GDataInputStream:		* GDataInputStream:
	* @parent: a #GBufferedInputStream.
	*		*
	* An implementation of #GBufferedInputStream that allows for high-level		* An implementation of #GBufferedInputStream that allows for high-level
	* data manipulation of arbitrary data (including binary operations).		* data manipulation of arbitrary data (including binary operations).
	**/		**/
	typedef struct _GDataInputStreamClass GDataInputStreamClass;		typedef struct _GDataInputStreamClass GDataInputStreamClass;
	typedef struct _GDataInputStreamPrivate GDataInputStreamPrivate;		typedef struct _GDataInputStreamPrivate GDataInputStreamPrivate;
	struct _GDataInputStream		struct _GDataInputStream
	{		{
	GBufferedInputStream parent_instance;		GBufferedInputStream parent_instance;
	skipping to change at line 76		skipping to change at line 75
	void (*_g_reserved2) (void);		void (*_g_reserved2) (void);
	void (*_g_reserved3) (void);		void (*_g_reserved3) (void);
	void (*_g_reserved4) (void);		void (*_g_reserved4) (void);
	void (*_g_reserved5) (void);		void (*_g_reserved5) (void);
	};		};
	GType g_data_input_stream_get_type (void) G_GN UC_CONST;		GType g_data_input_stream_get_type (void) G_GN UC_CONST;
	GDataInputStream * g_data_input_stream_new (GInputStre am *base_stream);		GDataInputStream * g_data_input_stream_new (GInputStre am *base_stream);
	void g_data_input_stream_set_byte_order (GDataInput Stream *stream,		void g_data_input_stream_set_byte_order (GDataInput Stream *stream,
	GDataStream ByteOrder order);		GDataStrea mByteOrder order);
	GDataStreamByteOrder g_data_input_stream_get_byte_order (GDataInput Stream *stream);		GDataStreamByteOrder g_data_input_stream_get_byte_order (GDataInput Stream *stream);
	void g_data_input_stream_set_newline_type (GDataInput Stream *stream,		void g_data_input_stream_set_newline_type (GDataInput Stream *stream,
	GDataStream NewlineType type);		GDataStrea mNewlineType type);
	GDataStreamNewlineType g_data_input_stream_get_newline_type (GDataInput Stream *stream);		GDataStreamNewlineType g_data_input_stream_get_newline_type (GDataInput Stream *stream);
	guchar g_data_input_stream_read_byte (GDataInput Stream *stream,		guchar g_data_input_stream_read_byte (GDataInput Stream *stream,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	gint16 g_data_input_stream_read_int16 (GDataInput Stream *stream,		gint16 g_data_input_stream_read_int16 (GDataInput Stream *stream,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	guint16 g_data_input_stream_read_uint16 (GDataInput Stream *stream,		guint16 g_data_input_stream_read_uint16 (GDataInput Stream *stream,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	gint32 g_data_input_stream_read_int32 (GDataInput Stream *stream,		gint32 g_data_input_stream_read_int32 (GDataInput Stream *stream,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	guint32 g_data_input_stream_read_uint32 (GDataInput Stream *stream,		guint32 g_data_input_stream_read_uint32 (GDataInput Stream *stream,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	gint64 g_data_input_stream_read_int64 (GDataInput Stream *stream,		gint64 g_data_input_stream_read_int64 (GDataInput Stream *stream,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	guint64 g_data_input_stream_read_uint64 (GDataInput Stream *stream,		guint64 g_data_input_stream_read_uint64 (GDataInput Stream *stream,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	char * g_data_input_stream_read_line (GDataInput Stream *stream,		char * g_data_input_stream_read_line (GDataInput Stream *stream,
	gsize		gsize
	*length,		*length,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	void g_data_input_stream_read_line_async (GDataInput Stream *stream,		void g_data_input_stream_read_line_async (GDataInput Stream *stream,
	gint io_priority,		gint io_priority,
	GCancellab le *cancellable,		GCancellab le *cancellable,
	GAsyncRead yCallback callback,		GAsyncRead yCallback callback,
	gpointer user_data);		gpointer user_data);
	char * g_data_input_stream_read_line_finish (GDataInput Stream *stream,		char * g_data_input_stream_read_line_finish (GDataInput Stream *stream,
	GAsyncResu lt *result,		GAsyncResu lt *result,
	gsize *length,		gsize *length,
	GError **error);		GError **error);
	char * g_data_input_stream_read_until (GDataInput Stream *stream,		char * g_data_input_stream_read_until (GDataInput Stream *stream,
	const gchar		const gcha
	*stop_chars,		r *stop_chars,
	gsize		gsize
	*length,		*length,
	GCancellabl		GCancellab
	e *cancellable,		le *cancellable,
	GError		GError
	**error);		**error);
	void g_data_input_stream_read_until_async (GDataInput Stream *stream,		void g_data_input_stream_read_until_async (GDataInput Stream *stream,
	const gchar *stop_chars,		const gcha r *stop_chars,
	gint io_priority,		gint io_priority,
	GCancellab le *cancellable,		GCancellab le *cancellable,
	GAsyncRead yCallback callback,		GAsyncRead yCallback callback,
	gpointer user_data);		gpointer user_data);
	char * g_data_input_stream_read_until_finish (GDataInput Stream *stream,		char * g_data_input_stream_read_until_finish (GDataInput Stream *stream,
	GAsyncResu lt *result,		GAsyncResu lt *result,
	gsize *length,		gsize *length,
	GError **error);		GError **error);
			char * g_data_input_stream_read_upto (GDataInput
			Stream *stream,
			const gcha
			r *stop_chars,
			gssize
			stop_chars_len,
			gsize
			*length,
			GCancellab
			le *cancellable,
			GError
			**error);
			void g_data_input_stream_read_upto_async (GDataInput
			Stream *stream,
			const gcha
			r *stop_chars,
			gssize
			stop_chars_len,
			gint
			io_priority,
			GCancellab
			le *cancellable,
			GAsyncRead
			yCallback callback,
			gpointer
			user_data);
			char * g_data_input_stream_read_upto_finish (GDataInput
			Stream *stream,
			GAsyncResu
			lt *result,
			gsize
			*length,
			GError
			**error);
	G_END_DECLS		G_END_DECLS
	#endif /* __G_DATA_INPUT_STREAM_H__ */		#endif /* __G_DATA_INPUT_STREAM_H__ */
End of changes. 14 change blocks.
	46 lines changed or deleted		80 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/