*** ./rzip.h.ORIG	Fri Jan 15 12:45:15 2010
--- ./rzip.h	Fri Jan 15 12:45:15 2010
***************
*** 39,45 ****
--- 39,47 ----
  #include <sys/time.h>
  
  #include <sys/mman.h>
+ #ifndef _AIX
  #include <sys/syscall.h>
+ #endif
  
  #ifdef __APPLE__
  #include <sys/sysctl.h>
*** ./Makefile.in.ORIG	Fri Jan 15 12:45:14 2010
--- ./Makefile.in	Fri Jan 15 12:45:14 2010
***************
*** 17,24 ****
  LDFLAGS=@LDFLAGS@
  CC=@CC@
  CXX=@CXX@
! CFLAGS=@CFLAGS@ -I. -I$(srcdir) -Wall -W -c
! CXXFLAGS=@CXXFLAGS@ -I. -I$(srcdir) -Wall -W -c
  LZMA_CFLAGS=-I@top_srcdir@/lzma/C -DCOMPRESS_MF_MT -D_REENTRANT
  
  INSTALLCMD=@INSTALL@
--- 17,24 ----
  LDFLAGS=@LDFLAGS@
  CC=@CC@
  CXX=@CXX@
! CFLAGS=@CFLAGS@ -I. -I$(srcdir) -c
! CXXFLAGS=@CXXFLAGS@ -I. -I$(srcdir) -c
  LZMA_CFLAGS=-I@top_srcdir@/lzma/C -DCOMPRESS_MF_MT -D_REENTRANT
  
  INSTALLCMD=@INSTALL@
*** ./zpipe.cpp.ORIG	Fri Jan 15 12:45:30 2010
--- ./zpipe.cpp	Fri Jan 15 13:22:43 2010
***************
*** 1486,1501 ****
    int ph, pm;  // sizes of H and M in z
    ZPAQL z;     // holds PCOMP
  public:
!   PostProcessor(ZPAQL& hz);
    void set(FILE* out, SHA1* p) {z.output=out; z.sha1=p;}  // Set output
    void write(int c);  // Input a byte
  };
  
  // Copy ph, pm from block header
! PostProcessor::PostProcessor(ZPAQL& hz) {
    state=0;
!   ph=hz.header[4];
!   pm=hz.header[5];
  }
  
  // (PASS=0 | PROG=1 psize[0..1] pcomp[0..psize-1]) data... EOB=-1
--- 1486,1501 ----
    int ph, pm;  // sizes of H and M in z
    ZPAQL z;     // holds PCOMP
  public:
!   PostProcessor(ZPAQL& MPhz);
    void set(FILE* out, SHA1* p) {z.output=out; z.sha1=p;}  // Set output
    void write(int c);  // Input a byte
  };
  
  // Copy ph, pm from block header
! PostProcessor::PostProcessor(ZPAQL& MPhz) {
    state=0;
!   ph=MPhz.header[4];
!   pm=MPhz.header[5];
  }
  
  // (PASS=0 | PROG=1 psize[0..1] pcomp[0..psize-1]) data... EOB=-1