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
/
gdataoutputstream.h
diff --git
a/gio/gdataoutputstream.h
b/gio/gdataoutputstream.h
index
00b8cf2
..
ebd6a5b
100644
(file)
--- a/
gio/gdataoutputstream.h
+++ b/
gio/gdataoutputstream.h
@@
-1,5
+1,5
@@
/* GIO - GLib Input, Output and Streaming Library
/* 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
* 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
* 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>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
@@
-23,9
+21,11
@@
#ifndef __G_DATA_OUTPUT_STREAM_H__
#define __G_DATA_OUTPUT_STREAM_H__
#ifndef __G_DATA_OUTPUT_STREAM_H__
#define __G_DATA_OUTPUT_STREAM_H__
-#include <glib-object.h>
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
#include <gio/gfilteroutputstream.h>
#include <gio/gfilteroutputstream.h>
-#include <gio/gdatainputstream.h>
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-38,9
+38,8
@@
G_BEGIN_DECLS
/**
* GDataOutputStream:
/**
* GDataOutputStream:
- * @parent: a #GBufferedOutputStream.
*
*
- * An implementation of #GBufferedOutputStream that allows for high-level
+ * An implementation of #GBufferedOutputStream that allows for high-level
* data manipulation of arbitrary data (including binary operations).
**/
typedef struct _GDataOutputStream GDataOutputStream;
* data manipulation of arbitrary data (including binary operations).
**/
typedef struct _GDataOutputStream GDataOutputStream;
@@
-49,7
+48,7
@@
typedef struct _GDataOutputStreamPrivate GDataOutputStreamPrivate;
struct _GDataOutputStream
{
struct _GDataOutputStream
{
- GFilterOutputStream parent;
+ GFilterOutputStream parent
_instance
;
/*< private >*/
GDataOutputStreamPrivate *priv;
/*< private >*/
GDataOutputStreamPrivate *priv;
@@
-57,7
+56,8
@@
struct _GDataOutputStream
struct _GDataOutputStreamClass
{
struct _GDataOutputStreamClass
{
- GFilterOutputStreamClass parent_class;
+ GFilterOutputStreamClass parent_class;
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@
-68,43
+68,53
@@
struct _GDataOutputStreamClass
};
};
-GType g_data_output_stream_get_type (void) G_GNUC_CONST;
-GDataOutputStream* g_data_output_stream_new (GOutputStream *base_stream);
+GLIB_AVAILABLE_IN_ALL
+GType g_data_output_stream_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+GDataOutputStream * g_data_output_stream_new (GOutputStream *base_stream);
-void g_data_output_stream_set_byte_order (GDataOutputStream *data_stream,
+GLIB_AVAILABLE_IN_ALL
+void g_data_output_stream_set_byte_order (GDataOutputStream *stream,
GDataStreamByteOrder order);
GDataStreamByteOrder order);
+GLIB_AVAILABLE_IN_ALL
GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream *stream);
GDataStreamByteOrder g_data_output_stream_get_byte_order (GDataOutputStream *stream);
-void g_data_output_stream_set_expand_buffer (GDataOutputStream *data_stream,
- gboolean expand_buffer);
-gboolean g_data_output_stream_put_byte (GDataOutputStream *data_stream,
+GLIB_AVAILABLE_IN_ALL
+gboolean g_data_output_stream_put_byte (GDataOutputStream *stream,
guchar data,
GCancellable *cancellable,
GError **error);
guchar data,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_int16 (GDataOutputStream *stream,
gint16 data,
GCancellable *cancellable,
GError **error);
gboolean g_data_output_stream_put_int16 (GDataOutputStream *stream,
gint16 data,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_uint16 (GDataOutputStream *stream,
guint16 data,
GCancellable *cancellable,
GError **error);
gboolean g_data_output_stream_put_uint16 (GDataOutputStream *stream,
guint16 data,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_int32 (GDataOutputStream *stream,
gint32 data,
GCancellable *cancellable,
GError **error);
gboolean g_data_output_stream_put_int32 (GDataOutputStream *stream,
gint32 data,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_uint32 (GDataOutputStream *stream,
guint32 data,
GCancellable *cancellable,
GError **error);
gboolean g_data_output_stream_put_uint32 (GDataOutputStream *stream,
guint32 data,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_int64 (GDataOutputStream *stream,
gint64 data,
GCancellable *cancellable,
GError **error);
gboolean g_data_output_stream_put_int64 (GDataOutputStream *stream,
gint64 data,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_uint64 (GDataOutputStream *stream,
guint64 data,
GCancellable *cancellable,
GError **error);
gboolean g_data_output_stream_put_uint64 (GDataOutputStream *stream,
guint64 data,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gboolean g_data_output_stream_put_string (GDataOutputStream *stream,
const char *str,
GCancellable *cancellable,
gboolean g_data_output_stream_put_string (GDataOutputStream *stream,
const char *str,
GCancellable *cancellable,