1.1 --- a/tools/lib/gzip_stream.c	Mon Jun 28 15:17:00 2004 +0000
     1.2 +++ b/tools/lib/gzip_stream.c	Mon Jun 28 15:38:10 2004 +0000
     1.3 @@ -28,8 +28,6 @@
     1.4  
     1.5  #include "zlib.h"
     1.6  
     1.7 -extern FILE* gzfile(gzFile file);
     1.8 -
     1.9  #include "allocate.h"
    1.10  #include "gzip_stream.h"
    1.11  
    1.12 @@ -59,18 +57,6 @@ static inline gzFile get_gzfile(IOStream
    1.13      return (gzFile)s->data;
    1.14  }
    1.15  
    1.16 -/** Control buffering on the underlying stream, like setvbuf().
    1.17 - *
    1.18 - * @param io gzip stream
    1.19 - * @param buf buffer
    1.20 - * @param mode buffering mode (see man setvbuf())
    1.21 - * @param size buffer size
    1.22 - * @return 0 on success, non-zero otherwise
    1.23 - */
    1.24 -int gzip_stream_setvbuf(IOStream *io, char *buf, int mode, size_t size){
    1.25 -    return setvbuf(gzfile(get_gzfile(io)), buf, mode, size);
    1.26 -}
    1.27 -
    1.28  /** Write to the underlying stream.
    1.29   *
    1.30   * @param stream destination
    1.31 @@ -113,7 +99,7 @@ static int gzip_error(IOStream *s){
    1.32      int err;
    1.33      gzFile *gz = get_gzfile(s);
    1.34      gzerror(gz, &err);
    1.35 -    return (err == Z_ERRNO ? ferror(gzfile(gz)) : err);
    1.36 +    return (err == Z_ERRNO ? 1 /* ferror(gzfile(gz)) */ : err);
    1.37  }
    1.38  
    1.39  /** Close a gzip stream.

     2.1 --- a/tools/lib/gzip_stream.h	Mon Jun 28 15:17:00 2004 +0000
     2.2 +++ b/tools/lib/gzip_stream.h	Mon Jun 28 15:38:10 2004 +0000
     2.3 @@ -27,7 +27,5 @@
     2.4  extern IOStream *gzip_stream_new(gzFile *f);
     2.5  extern IOStream *gzip_stream_fopen(const char *file, const char *flags);
     2.6  extern IOStream *gzip_stream_fdopen(int fd, const char *flags);
     2.7 -
     2.8 -extern int gzip_stream_setvbuf(IOStream *io, char *buf, int mode, size_t size);
     2.9  #endif
    2.10  #endif /* !_SP_FILE_STREAM_H_ */

     3.1 --- a/tools/misc/Makefile	Mon Jun 28 15:17:00 2004 +0000
     3.2 +++ b/tools/misc/Makefile	Mon Jun 28 15:38:10 2004 +0000
     3.3 @@ -4,6 +4,7 @@ CFLAGS     = -Wall -O3
     3.4  EXTRA_INC  = -I../../xen/include/hypervisor-ifs
     3.5  EXTRA_INC += -I../../linux-xen-sparse/include -I../xc/lib
     3.6  EXTRA_INC += -I../xu/lib
     3.7 +EXTRA_INC += -I../lib
     3.8  
     3.9  HDRS     = $(wildcard *.h)
    3.10  SRCS     = $(wildcard *.c)

     4.1 --- a/tools/xc/lib/xc_io.h	Mon Jun 28 15:17:00 2004 +0000
     4.2 +++ b/tools/xc/lib/xc_io.h	Mon Jun 28 15:38:10 2004 +0000
     4.3 @@ -2,7 +2,7 @@
     4.4  #define __XC_XC_IO_H__
     4.5  
     4.6  #include "xc_private.h"
     4.7 -#include <iostream.h>
     4.8 +#include "iostream.h"
     4.9  
    4.10  typedef struct XcIOContext {
    4.11      u32 domain;

     5.1 --- a/tools/xentrace/Makefile	Mon Jun 28 15:17:00 2004 +0000
     5.2 +++ b/tools/xentrace/Makefile	Mon Jun 28 15:38:10 2004 +0000
     5.3 @@ -4,6 +4,7 @@ CFLAGS   = -Wall -O3 -Werror
     5.4  CFLAGS  += -I../../xen/include/hypervisor-ifs
     5.5  CFLAGS  += -I../../linux-xen-sparse/include
     5.6  CFLAGS  += -I../xu/lib
     5.7 +CFLAGS  += -I../lib
     5.8  
     5.9  HDRS     = $(wildcard *.h)
    5.10  OBJS     = $(patsubst %.c,%.o,$(wildcard *.c))