projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gthreadedresolver: Unref unexpected address
[platform/upstream/glib.git]
/
gio
/
gconverterinputstream.h
diff --git
a/gio/gconverterinputstream.h
b/gio/gconverterinputstream.h
index
8e4f1d4
..
9f6d063
100644
(file)
--- a/
gio/gconverterinputstream.h
+++ b/
gio/gconverterinputstream.h
@@
-13,20
+13,18
@@
* 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>
*/
+#ifndef __G_CONVERTER_INPUT_STREAM_H__
+#define __G_CONVERTER_INPUT_STREAM_H__
+
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
-#ifndef __G_CONVERTER_INPUT_STREAM_H__
-#define __G_CONVERTER_INPUT_STREAM_H__
-
#include <gio/gfilterinputstream.h>
#include <gio/gconverter.h>
#include <gio/gfilterinputstream.h>
#include <gio/gconverter.h>
@@
-69,9
+67,12
@@
struct _GConverterInputStreamClass
void (*_g_reserved5) (void);
};
void (*_g_reserved5) (void);
};
+GLIB_AVAILABLE_IN_ALL
GType g_converter_input_stream_get_type (void) G_GNUC_CONST;
GType g_converter_input_stream_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
GInputStream *g_converter_input_stream_new (GInputStream *base_stream,
GConverter *converter);
GInputStream *g_converter_input_stream_new (GInputStream *base_stream,
GConverter *converter);
+GLIB_AVAILABLE_IN_ALL
GConverter *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream);
G_END_DECLS
GConverter *g_converter_input_stream_get_converter (GConverterInputStream *converter_stream);
G_END_DECLS