*** ./epan/wslua/lua_bitop.c.ORIG	Sat Oct 29 10:08:04 2011
--- ./epan/wslua/lua_bitop.c	Sat Oct 29 10:09:04 2011
***************
*** 40,46 ****
--- 40,50 ----
  typedef unsigned __int32 uint32_t;
  typedef unsigned __int64 uint64_t;
  #else
+ #ifdef _AIX51
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #endif
  
  typedef int32_t SBits;
  
*** ./extcap/androiddump.c.ORIG	Fri Jan 15 00:14:18 2016
--- ./extcap/androiddump.c	Fri Jan 15 00:14:47 2016
***************
*** 26,32 ****
--- 26,36 ----
  #include <glib.h>
  #include <glib/gprintf.h>
  #include <stdio.h>
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #include <stdlib.h>
  #include <string.h>
  #include <errno.h>
*** ./capchild/capture_session.h.ORIG	Thu Jan 14 22:27:49 2016
--- ./capchild/capture_session.h	Thu Jan 14 22:28:21 2016
***************
*** 29,35 ****
--- 29,39 ----
  
  #ifndef _WIN32
  #include <sys/types.h>
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #endif
  
  #include "capture_opts.h"
*** ./epan/dissectors/packet-cbor.c.ORIG	Wed Mar  9 13:42:57 2016
--- ./epan/dissectors/packet-cbor.c	Wed Mar  9 13:50:45 2016
***************
*** 598,603 ****
--- 598,607 ----
  	return item;
  }
  
+ #if defined(_AIX) && !defined(_AIX52)
+ #define ldexpf ldexp
+ #endif
+ 
  /* based on code from rfc7049 appendix-D */
  static proto_item *decode_half(tvbuff_t *tvb, proto_tree *tree, gint *offset, int hfindex) {
  	int half, exponent, mantissa;
*** ./epan/dissectors/packet-atn-ulcs.c.ORIG	Thu Jan 14 20:49:55 2016
--- ./epan/dissectors/packet-atn-ulcs.c	Thu Jan 14 20:48:27 2016
***************
*** 117,123 ****
--- 117,127 ----
  #include "config.h"
  
  #ifndef _MSC_VER
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #endif
  
  
*** ./ui/ui_util.h.ORIG	Thu Jan 14 22:29:02 2016
--- ./ui/ui_util.h	Thu Jan 14 22:29:26 2016
***************
*** 25,31 ****
--- 25,35 ----
  #ifndef __UI_UTIL_H__
  #define __UI_UTIL_H__
  
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  
  #include <wsutil/processes.h>
  
*** ./asn1/atn-ulcs/packet-atn-ulcs-template.c.ORIG	Thu Jan 14 20:43:52 2016
--- ./asn1/atn-ulcs/packet-atn-ulcs-template.c	Thu Jan 14 20:49:04 2016
***************
*** 109,115 ****
--- 109,119 ----
  #include "config.h"
  
  #ifndef _MSC_VER
+ #if defined(_AIX) && !defined(_AIX52)
+ #include <inttypes.h>
+ #else
  #include <stdint.h>
+ #endif
  #endif
  
  
*** ./wsutil/wsgetopt.c.ORIG	Wed Mar  9 15:12:12 2016
--- ./wsutil/wsgetopt.c	Wed Mar  9 15:13:20 2016
***************
*** 30,35 ****
--- 30,39 ----
  # define _NO_PROTO
  #endif
  
+ #ifdef _AIX
+ #include <alloca.h>
+ #endif
+ 
  #include "config.h"
  
  #include <stdio.h>