- (stevesk) compress.[ch] sync with openbsd; missed in prototype

   fix merge.

3 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 09c1a8222..8caa9b6fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@
    - markus@cvs.openbsd.org 2000/12/27 11:41:31
      [sshd.8]
      update for ssh-2
+ - (stevesk) compress.[ch] sync with openbsd; missed in prototype
+   fix merge.
 
 20001228
  - (bal) Patch to add libutil.h to loginrec.c only if the platform has
diff --git a/compress.c b/compress.c
index 3c05886e1..2437606b7 100644
--- a/compress.c
+++ b/compress.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compress.c,v 1.10 2000/12/19 23:17:56 markus Exp $");
+RCSID("$OpenBSD: compress.c,v 1.11 2000/12/20 19:37:21 markus Exp $");
 
 #include "ssh.h"
 #include "buffer.h"
@@ -39,7 +39,7 @@ buffer_compress_init(int level)
 /* Frees any data structures allocated for compression. */
 
 void
-buffer_compress_uninit()
+buffer_compress_uninit(void)
 {
         debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
               outgoing_stream.total_in, outgoing_stream.total_out,
diff --git a/compress.h b/compress.h
index 575716481..87d592fe9 100644
--- a/compress.h
+++ b/compress.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: compress.h,v 1.6 2000/09/07 20:27:50 deraadt Exp $"); */
+/* RCSID("$OpenBSD: compress.h,v 1.7 2000/12/20 19:37:22 markus Exp $"); */
 
 #ifndef COMPRESS_H
 #define COMPRESS_H
@@ -23,7 +23,7 @@
 void    buffer_compress_init(int level);
 
 /* Frees any data structures allocated by buffer_compress_init. */
-void    buffer_compress_uninit();
+void    buffer_compress_uninit(void);
 
 /*
  * Compresses the contents of input_buffer into output_buffer.  All packets