$OpenBSD: patch-base_src_common_SDR_h,v 1.3 2002/09/04 16:21:43 todd Exp $
--- base/src/common/SDR.h.orig	Mon Jul 22 02:02:49 2002
+++ base/src/common/SDR.h	Tue Sep  3 23:34:47 2002
@@ -64,7 +64,7 @@ SDR_stream*    stream_createBuffer(unsig
 
 SDR_stream*    stream_create_sha1(void);
 
-SDR_stream*    stream_fromfile(const char *fileName, unsigned formet);
+SDR_stream*    stream_fromfile(const char *fileName, unsigned format);
 SDR_stream*    stream_fromMemory(const char *buffer, unsigned len, unsigned format);
 SDR_stream*    stream_fromBuffer(Buffer *buf, unsigned format);
 
@@ -95,26 +95,22 @@ size_t         stream_scanf(SDR_stream*,
 
 
 
-void           sdr_w_u8(const char *elem, SDR_stream *,
-			unsigned char);
-unsigned char  sdr_r_u8(const char *elem, SDR_stream *);
-
-void           sdr_w_u16(const char *elem, SDR_stream *,
-			 unsigned short);
-unsigned short sdr_r_u16(const char *elem, SDR_stream *);
-
-void           sdr_w_u32(const char *elem, SDR_stream *,
-			   unsigned long);
-unsigned long  sdr_r_u32(const char *elem, SDR_stream *);
+void           sdr_w_u8(const char *elem, SDR_stream *, u_int8_t);
+u_int8_t       sdr_r_u8(const char *elem, SDR_stream *);
 
-void           sdr_w_u64(const char *elem, SDR_stream *,
-			 oc_uint64_t);
+void           sdr_w_u16(const char *elem, SDR_stream *, u_int16_t);
+u_int16_t      sdr_r_u16(const char *elem, SDR_stream *);
+
+void           sdr_w_u32(const char *elem, SDR_stream *, u_int32_t);
+u_int32_t      sdr_r_u32(const char *elem, SDR_stream *);
+
+void           sdr_w_u64(const char *elem, SDR_stream *, oc_uint64_t);
 oc_uint64_t    sdr_r_u64(const char *elem, SDR_stream *);
 
 void           sdr_w_bytes(const char *elem, SDR_stream *,
-			   unsigned long len, const void *);
+			   u_int32_t len, const void *);
 void *         sdr_r_bytes(const char *elem, SDR_stream *,
-			   unsigned long len);
+			   u_int32_t len);
 
 void           sdr_w_buffer(const char *elem, SDR_stream *, const Buffer*);
 Buffer *       sdr_r_buffer(const char *elem, SDR_stream *, ocmoff_t len);
