first.c compilet en draait!

[projects/chimara/chimara.git] / src / stream.h

diff --git a/src/stream.h b/src/stream.h
index 3fd4fcba07717fee0ec1b74f890d4cb0a31811a2..b5a1e6092edf7bed4c74eea92bbe2163cf09396c 100644 (file)
--- a/src/stream.h
+++ b/src/stream.h
@@ -9,9 +9,7 @@ enum StreamType
 {
        STREAM_TYPE_WINDOW,
        STREAM_TYPE_MEMORY,
-       STREAM_TYPE_FILE,
-       STREAM_TYPE_UNICODE_MEMORY,
-       STREAM_TYPE_UNICODE_FILE
+       STREAM_TYPE_FILE
 };
 
 struct glk_stream_struct
@@ -27,12 +25,19 @@ struct glk_stream_struct
        enum StreamType stream_type;
        /* Specific to window stream: the window this stream is connected to */
        winid_t window;
+       /* For memory and file streams */
+       gboolean unicode;
        /* Specific to memory streams */
-       gchar *memory_buffer;
-       glui32 *memory_buffer_unicode;
-       glui32 buffer_len;
+       gchar *buffer;
+       glui32 *ubuffer;
+       glui32 mark;
+       glui32 buflen;
+       /* Specific to file streams */
+       FILE *file_pointer;
+       gboolean binary;
+       gchar *filename; /* Displayable filename in UTF-8 for error handling */
 };
 
 strid_t window_stream_new(winid_t window);
-
+void stream_close_common(strid_t str, stream_result_t *result);
 #endif