*** ./xdelta3.h.ORIG	Mon Aug 18 12:59:12 2014
--- ./xdelta3.h	Mon Aug 18 12:59:34 2014
***************
*** 109,115 ****
--- 109,119 ----
   * the 32bit boundary [xdelta3-test.h]).
   */
  #ifndef _WIN32
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #else
  #define WIN32_LEAN_AND_MEAN
  #if XD3_USE_LARGEFILE64
*** ./Makefile.in.ORIG	Mon Aug 18 13:00:49 2014
--- ./Makefile.in	Mon Aug 18 13:00:54 2014
***************
*** 261,268 ****
  
  # Note: for extra sanity checks, enable -Wconversion. Note there
  # are a lot of false positives.
! WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \
! 	 -Wextra -Wno-unused-parameter
  
  C_WFLAGS = $(WFLAGS) -pedantic -std=c99
  CXX_WFLAGS = $(WFLAGS)
--- 261,267 ----
  
  # Note: for extra sanity checks, enable -Wconversion. Note there
  # are a lot of false positives.
! WFLAGS = 
  
  C_WFLAGS = $(WFLAGS) -pedantic -std=c99
  CXX_WFLAGS = $(WFLAGS)
*** ./testing/regtest.cc.ORIG	Mon Aug 18 13:49:49 2014
--- ./testing/regtest.cc	Mon Aug 18 13:42:33 2014
***************
*** 760,767 ****
    TmpFile f0, f1, f2, f3;
    ExtFile d01, d12, d23;
    Options options;
!   options.encode_srcwin_maxsz = 
!     std::max(spec0.Size(), options.encode_srcwin_maxsz);
  
    spec0.WriteTmpFile(&f0);
    spec1.WriteTmpFile(&f1);
--- 760,767 ----
    TmpFile f0, f1, f2, f3;
    ExtFile d01, d12, d23;
    Options options;
!   if (spec0.Size() > options.encode_srcwin_maxsz)
!     options.encode_srcwin_maxsz = spec0.Size();
  
    spec0.WriteTmpFile(&f0);
    spec1.WriteTmpFile(&f1);