*** ./src/lib/openjp2/opj_stdint.h.ORIG	Tue Apr 29 09:15:02 2014
--- ./src/lib/openjp2/opj_stdint.h	Mon Jul 28 16:53:03 2014
***************
*** 45,50 ****
--- 45,54 ----
  typedef   signed __int64  int64_t;
  typedef unsigned __int64  uint64_t;
  #else
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #error unsupported platform
+ #endif
  #endif
  #endif
*** ./src/lib/openjp2/openjpeg.h.ORIG	Mon Jul 28 17:46:11 2014
--- ./src/lib/openjp2/openjpeg.h	Mon Jul 28 17:46:36 2014
***************
*** 48,53 ****
--- 48,55 ----
  	#define DEPRECATED(func) func __attribute__ ((deprecated))
  #elif defined(_MSC_VER)
  	#define DEPRECATED(func) __declspec(deprecated) func
+ #elif defined(__VACPP_MULTI__)
+ 	#define OPJ_DEPRECATED(func) func
  #else
  	#pragma message("WARNING: You need to implement DEPRECATED for this compiler")
  	#define DEPRECATED(func) func
*** ./src/lib/openjp2/opj_includes.h.ORIG	Mon Jul 28 18:28:04 2014
--- ./src/lib/openjp2/opj_includes.h	Mon Jul 28 18:28:36 2014
***************
*** 129,134 ****
--- 129,138 ----
  	#endif
  #endif
  
+ #if defined(_AIX) && !defined(_AIX52)
+ #define lrintf(x) ((long) (x))
+ #endif
+ 
  /* MSVC and Borland C do not have lrintf */
  #if defined(_MSC_VER) || defined(__BORLANDC__)
  static INLINE long lrintf(float f){