--- a/src/lstream.h	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/lstream.h	Mon Aug 13 11:13:30 2007 +0200
@@ -23,8 +23,8 @@
 
 /* Written by Ben Wing. */
 
-#ifndef _XEMACS_LSTREAM_H_
-#define _XEMACS_LSTREAM_H_
+#ifndef INCLUDED_lstream_h_
+#define INCLUDED_lstream_h_
 
 /************************************************************************/
 /*                     definition of Lstream object                     */
@@ -74,7 +74,7 @@
 
 typedef struct lstream_implementation
 {
-  CONST char *name;
+  const char *name;
   size_t size; /* Number of additional bytes to be allocated with this
 		  stream.  Access this data using Lstream_data(). */
   /* Read some data from the stream's end and store it into DATA, which
@@ -95,7 +95,7 @@
   /* The omniscient mly, blinded by the irresistable thrall of Common
      Lisp, thinks that it is bogus that the types and implementations
      of input and output streams are the same. */
-  int (*reader) (Lstream *stream, unsigned char *data, size_t size);
+  ssize_t (*reader) (Lstream *stream, unsigned char *data, size_t size);
   /* Send some data to the stream's end.  Data to be sent is in DATA
      and is SIZE bytes.  Return the number of bytes sent.  This
      function can send and return fewer bytes than is passed in; in
@@ -106,7 +106,7 @@
      data. (This is useful, e.g., of you're dealing with a
      non-blocking file descriptor and are getting EWOULDBLOCK errors.)
      This function can be NULL if the stream is input-only. */
-  int (*writer) (Lstream *stream, CONST unsigned char *data, size_t size);
+  ssize_t (*writer) (Lstream *stream, const unsigned char *data, size_t size);
   /* Return non-zero if the last write operation on the stream resulted
      in an attempt to block (EWOULDBLOCK). If this method does not
      exists, the implementation returns 0 */
@@ -129,7 +129,7 @@
   int (*closer) (Lstream *stream);
   /* Mark this object for garbage collection.  Same semantics as
      a standard Lisp_Object marker.  This function can be NULL. */
-  Lisp_Object (*marker) (Lisp_Object lstream, void (*markfun) (Lisp_Object));
+  Lisp_Object (*marker) (Lisp_Object lstream);
 } Lstream_implementation;
 
 #define DEFINE_LSTREAM_IMPLEMENTATION(name,c_name,size)	\
@@ -145,7 +145,7 @@
 struct lstream
 {
   struct lcrecord_header header;
-  CONST Lstream_implementation *imp; /* methods for this stream */
+  const Lstream_implementation *imp; /* methods for this stream */
   Lstream_buffering buffering; /* type of buffering in use */
   size_t buffering_size; /* number of bytes buffered */
 
@@ -177,10 +177,10 @@
 #ifdef ERROR_CHECK_TYPECHECK
 INLINE struct lstream *
 error_check_lstream_type (struct lstream *stream,
-			  CONST Lstream_implementation *imp);
+			  const Lstream_implementation *imp);
 INLINE struct lstream *
 error_check_lstream_type (struct lstream *stream,
-			  CONST Lstream_implementation *imp)
+			  const Lstream_implementation *imp)
 {
   assert (stream->imp == imp);
   return stream;
@@ -199,8 +199,8 @@
   (lstream_##type->m = type##_##m)
 
 
-Lstream *Lstream_new (CONST Lstream_implementation *imp,
-		      CONST char *mode);
+Lstream *Lstream_new (const Lstream_implementation *imp,
+		      const char *mode);
 void Lstream_reopen (Lstream *lstr);
 void Lstream_set_buffering (Lstream *lstr, Lstream_buffering buffering,
 			    int buffering_size);
@@ -209,10 +209,10 @@
 int Lstream_fputc (Lstream *lstr, int c);
 int Lstream_fgetc (Lstream *lstr);
 void Lstream_fungetc (Lstream *lstr, int c);
-int Lstream_read (Lstream *lstr, void *data, size_t size);
-int Lstream_write (Lstream *lstr, CONST void *data, size_t size);
+ssize_t Lstream_read (Lstream *lstr, void *data, size_t size);
+ssize_t Lstream_write (Lstream *lstr, const void *data, size_t size);
 int Lstream_was_blocked_p (Lstream *lstr);
-void Lstream_unread (Lstream *lstr, CONST void *data, size_t size);
+void Lstream_unread (Lstream *lstr, const void *data, size_t size);
 int Lstream_rewind (Lstream *lstr);
 int Lstream_seekable_p (Lstream *lstr);
 int Lstream_close (Lstream *lstr);
@@ -339,11 +339,9 @@
 Lisp_Object make_lisp_string_input_stream (Lisp_Object string,
 					   Bytecount offset,
 					   Bytecount len);
-Lisp_Object make_fixed_buffer_input_stream (CONST unsigned char *buf,
-					    size_t size);
-Lisp_Object make_fixed_buffer_output_stream (unsigned char *buf,
-					     size_t size);
-CONST unsigned char *fixed_buffer_input_stream_ptr (Lstream *stream);
+Lisp_Object make_fixed_buffer_input_stream (const void *buf, size_t size);
+Lisp_Object make_fixed_buffer_output_stream (void *buf, size_t size);
+const unsigned char *fixed_buffer_input_stream_ptr (Lstream *stream);
 unsigned char *fixed_buffer_output_stream_ptr (Lstream *stream);
 Lisp_Object make_resizing_buffer_output_stream (void);
 unsigned char *resizing_buffer_stream_ptr (Lstream *stream);
@@ -356,4 +354,4 @@
 					    int flags);
 Bufpos lisp_buffer_stream_startpos (Lstream *stream);
 
-#endif /* _XEMACS_LSTREAM_H_ */
+#endif /* INCLUDED_lstream_h_ */