*** ./poppler/SplashOutputDev.cc.ORIG	Wed Apr 27 13:03:49 2011
--- ./poppler/SplashOutputDev.cc	Wed Apr 27 13:04:14 2011
***************
*** 68,73 ****
--- 68,77 ----
  #endif
  #endif
  
+ #if defined(_AIX51) && !defined(_AIX52)
+ #define isfinite(x) finite(x)
+ #endif
+ 
  #ifdef _MSC_VER
  #include <float.h>
  #define isfinite(x) _finite(x)
*** ./poppler/TextOutputDev.cc.ORIG	Wed Apr 27 13:05:55 2011
--- ./poppler/TextOutputDev.cc	Wed Apr 27 13:38:40 2011
***************
*** 63,68 ****
--- 63,86 ----
  #include "ICSupport.h"
  #endif
  
+ #if defined(_AIX51) && !defined(_AIX52)
+ static inline double fmax( double x, double y )
+ {
+   if (x > y)
+     return( x );
+   else
+     return( y );
+ }
+ 
+ static inline double fmin( double x, double y )
+ {
+   if (x < y)
+     return( x );
+   else
+     return( y );
+ }
+ #endif
+ 
  //------------------------------------------------------------------------
  // parameters
  //------------------------------------------------------------------------
*** ./poppler/CairoRescaleBox.cc.ORIG	Wed Apr 27 13:39:00 2011
--- ./poppler/CairoRescaleBox.cc	Wed Apr 27 13:39:19 2011
***************
*** 29,35 ****
--- 29,37 ----
  #include <config.h>
  #endif
  
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdio.h>
  #include <assert.h>
  #include <stdlib.h>
*** ./glib/poppler-layer.cc.ORIG	Thu Oct 18 15:28:44 2012
--- ./glib/poppler-layer.cc	Thu Oct 18 15:29:29 2012
***************
*** 187,192 ****
--- 187,196 ----
    return poppler_layer->layer->kids != NULL;
  }
  
+ 
+ /* required for proper 64-bit compile, is fine for 32-bit also */
+ #define GPOINTER_TO_LONG(p)     ((glong) (p))
+ 
  /**
   * poppler_layer_get_radio_button_group_id
   * @layer: a #PopplerLayer
***************
*** 201,205 ****
  {
    g_return_val_if_fail (POPPLER_IS_LAYER (poppler_layer), FALSE);
  
!   return GPOINTER_TO_INT (poppler_layer->rbgroup);
  }
--- 205,209 ----
  {
    g_return_val_if_fail (POPPLER_IS_LAYER (poppler_layer), FALSE);
  
!   return GPOINTER_TO_LONG (poppler_layer->rbgroup);
  }
*** ./goo/PNGWriter.cc.ORIG	Thu Oct 18 18:06:03 2012
--- ./goo/PNGWriter.cc	Thu Oct 18 18:11:34 2012
***************
*** 55,60 ****
--- 55,67 ----
  	sRGB_profile = true;
  }
  
+ // /usr/include/sys/context.h contains the following line :-(
+ // #define jmpbuf          __jmpbuf)
+ // which messes up the jmpbuf png_struct member
+ #ifdef jmpbuf
+ #undef jmpbuf
+ #endif
+ 
  bool PNGWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
  {
    /* libpng changed the png_set_iCCP() prototype in 1.5.0 */
*** ./glib/poppler-page.cc.ORIG	Fri Oct 19 09:56:05 2012
--- ./glib/poppler-page.cc	Fri Oct 19 09:56:38 2012
***************
*** 303,312 ****
      }
  }
  
  static GBool
  poppler_print_annot_cb (Annot *annot, void *user_data)
  {
!   PopplerPrintFlags user_print_flags = (PopplerPrintFlags)GPOINTER_TO_INT (user_data);
  
    if (annot->getFlags () & Annot::flagHidden)
      return gFalse;
--- 303,315 ----
      }
  }
  
+ /* required for proper 64-bit compile, is fine for 32-bit also */
+ #define GPOINTER_TO_LONG(p)     ((glong) (p))
+ 
  static GBool
  poppler_print_annot_cb (Annot *annot, void *user_data)
  {
!   PopplerPrintFlags user_print_flags = (PopplerPrintFlags)GPOINTER_TO_LONG (user_data);
  
    if (annot->getFlags () & Annot::flagHidden)
      return gFalse;
***************
*** 983,989 ****
  static GBool
  image_draw_decide_cb (int image_id, void *data)
  {
!   return (image_id == GPOINTER_TO_INT (data));
  }
  
  /**
--- 986,992 ----
  static GBool
  image_draw_decide_cb (int image_id, void *data)
  {
!   return (image_id == GPOINTER_TO_LONG (data));
  }
  
  /**