*** ./util/cairo-script/cairo-script-private.h.ORIG	Wed Apr 27 00:00:11 2011
--- ./util/cairo-script/cairo-script-private.h	Wed Apr 27 00:02:17 2011
***************
*** 425,431 ****
  };
  
  struct _csi_scanner {
!     jmp_buf jmpbuf;
      int depth;
  
      int bind;
--- 425,431 ----
  };
  
  struct _csi_scanner {
!     jmp_buf __jmpbuf;
      int depth;
  
      int bind;
*** ./src/cairoint.h.ORIG	Mon Aug 20 17:01:04 2012
--- ./src/cairoint.h	Mon Aug 20 17:01:25 2012
***************
*** 57,62 ****
--- 57,65 ----
  #include <assert.h>
  #include <stdlib.h>
  #include <string.h>
+ #ifdef _AIX
+ #include <strings.h>
+ #endif
  #include <stdarg.h>
  #include <stddef.h>
  
*** ./util/cairo-script/cairo-script-scanner.c.ORIG	Thu Oct 18 10:07:20 2012
--- ./util/cairo-script/cairo-script-scanner.c	Thu Oct 18 10:08:00 2012
***************
*** 37,43 ****
--- 37,47 ----
  #include <limits.h> /* INT_MAX */
  #include <math.h> /* pow */
  #include <stdio.h> /* EOF */
+ #if defined(_AIX51) && !defined(_AIX52)
+ #include <inttypes.h> /* for {INT,UINT}*_{MIN,MAX} */
+ #else
  #include <stdint.h> /* for {INT,UINT}*_{MIN,MAX} */
+ #endif
  #include <string.h> /* memset */
  #include <assert.h>
  #include <zlib.h>
*** ./src/cairo-xlib-surface-shm.c.ORIG	Thu Oct 18 12:36:08 2012
--- ./src/cairo-xlib-surface-shm.c	Thu Oct 18 12:45:21 2012
***************
*** 51,57 ****
--- 51,61 ----
  #include <X11/Xlibint.h>
  #include <X11/Xproto.h>
  #include <X11/extensions/XShm.h>
+ #ifndef _AIX
  #include <X11/extensions/shmproto.h>
+ #else
+ #define SHMNAME "MIT-SHM"
+ #endif
  #include <sys/ipc.h>
  #include <sys/shm.h>