*** ./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 #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 #endif + #ifndef _AIX51 #include + #endif #include #include #include *** ./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); } *** ./glib/poppler-page.cc.ORIG Fri Oct 19 10:16:11 2012 --- ./glib/poppler-page.cc Fri Oct 19 10:16:57 2012 *************** *** 304,313 **** } } 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; --- 304,316 ---- } } + /* 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)); } /**