*** ./man/pod2man.mk.ORIG	Mon Feb 21 23:07:49 2011
--- ./man/pod2man.mk	Mon Feb 21 23:08:34 2011
***************
*** 46,52 ****
  MANPAGE		= $(MANDEST)$(PACKAGE).$(MANSECT)
  
  POD2MAN		= pod2man
! POD2MAN_FLAGS	= --utf8
  
  makeman: $(MANPAGE)
  
--- 46,52 ----
  MANPAGE		= $(MANDEST)$(PACKAGE).$(MANSECT)
  
  POD2MAN		= pod2man
! POD2MAN_FLAGS	=
  
  makeman: $(MANPAGE)
  
*** ./md5.h.ORIG	Mon Feb 21 22:24:36 2011
--- ./md5.h	Mon Feb 21 22:24:48 2011
***************
*** 26,32 ****
--- 26,34 ----
  #define _MD5_H 1
  
  #include <stdio.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  #define MD5_DIGEST_SIZE 16
  #define MD5_BLOCK_SIZE 64
*** ./rzip.h.ORIG	Mon Feb 21 22:25:06 2011
--- ./rzip.h	Mon Feb 21 22:58:32 2011
***************
*** 43,49 ****
--- 43,51 ----
  #include <sys/time.h>
  
  #include <sys/mman.h>
+ #ifndef _AIX
  #include <sys/syscall.h>
+ #endif
  
  #include <lzo/lzoconf.h>
  #include <lzo/lzo1x.h>
***************
*** 118,125 ****
--- 120,141 ----
  extern int errno;
  #endif
  
+ /* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */
+ #if defined (__GNUC__) && defined (__GNUC_MINOR__)
+ #define __GNUC_PREREQ(maj, min) \
+   ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+ #else
+ #define __GNUC_PREREQ(maj, min)  0
+ #endif
+ 
+ /* __builtin_expect is in gcc 3.0, and not in 2.95. */
+ #if __GNUC_PREREQ (3,0)
  #define likely(x)	__builtin_expect(!!(x), 1)
  #define unlikely(x)	__builtin_expect(!!(x), 0)
+ #else
+ #define likely(cond)	(cond)
+ #define unlikely(cond)	(cond)
+ #endif
  
  typedef long long int i64;
  typedef uint16_t u16;
***************
*** 135,145 ****
--- 151,163 ----
   #define PROCESSORS (sysconf(_SC_NPROCESSORS_ONLN))
  #endif
  
+ #if !defined(_AIX)
  #ifdef _SC_PAGE_SIZE
   #define PAGE_SIZE (sysconf(_SC_PAGE_SIZE))
  #else
   #define PAGE_SIZE (4096)
  #endif
+ #endif
  
  void fatal(const char *format, ...);
  
***************
*** 164,169 ****
--- 182,199 ----
  
  	return ramsize;
  }
+ #elif _AIX
+  #define fmemopen fake_fmemopen
+  #define open_memstream fake_open_memstream
+  #define memstream_update_buffer fake_open_memstream_update_buffer
+  #define mremap fake_mremap
+ static inline i64 get_ram(void)
+ {
+ 	i64 ramsize;
+ 
+ 	ramsize = (i64)sysconf(_SC_PHYS_PAGES) * (i64)sysconf(_SC_PAGE_SIZE);
+ 	return ramsize;
+ }
  #else /* __APPLE__ */
   #define memstream_update_buffer(A, B, C) (0)
  static inline i64 get_ram(void)
*** ./zpipe.cpp.ORIG	Mon Feb 21 22:26:02 2011
--- ./zpipe.cpp	Mon Feb 21 22:26:24 2011
***************
*** 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& AIXhz);
    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& AIXhz) {
    state=0;
!   ph=AIXhz.header[4];
!   pm=AIXhz.header[5];
  }
  
  // (PASS=0 | PROG=1 psize[0..1] pcomp[0..psize-1]) data... EOB=-1