*** ./src/oping.c.ORIG	Thu Nov 18 14:12:26 2010
--- ./src/oping.c	Thu Nov 18 14:14:13 2010
***************
*** 25,31 ****
--- 25,33 ----
  # include <stdlib.h>
  # include <stdio.h>
  # include <string.h>
+ #ifndef _AIX51
  # include <stdint.h>
+ #endif
  # include <inttypes.h>
  # include <errno.h>
  # include <assert.h>
***************
*** 306,313 ****
  			"\n",
  			(unsigned int) IPTOS_LOWDELAY,
  			(unsigned int) IPTOS_THROUGHPUT,
! 			(unsigned int) IPTOS_RELIABILITY,
! 			(unsigned int) IPTOS_MINCOST);
  
  	exit (status);
  } /* }}} void usage_qos_exit */
--- 308,314 ----
  			"\n",
  			(unsigned int) IPTOS_LOWDELAY,
  			(unsigned int) IPTOS_THROUGHPUT,
! 			(unsigned int) IPTOS_RELIABILITY);
  
  	exit (status);
  } /* }}} void usage_qos_exit */
***************
*** 384,391 ****
  		opt_send_qos = IPTOS_THROUGHPUT;
  	else if (strcasecmp ("reliability", opt) == 0)
  		opt_send_qos = IPTOS_RELIABILITY;
- 	else if (strcasecmp ("mincost", opt) == 0)
- 		opt_send_qos = IPTOS_MINCOST;
  	/* Numeric value */
  	else
  	{
--- 385,390 ----
*** ./bindings/perl/Oping.xs.ORIG	Tue Nov 22 11:59:54 2011
--- ./bindings/perl/Oping.xs	Tue Nov 22 12:02:21 2011
***************
*** 28,34 ****
--- 28,36 ----
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
+ #if defined(AIX52)
  #include <stdint.h>
+ #endif
  #include <inttypes.h>
  #include <errno.h>
  #include <assert.h>
*** ./src/Makefile.in.ORIG	Tue Nov 22 12:09:06 2011
--- ./src/Makefile.in	Tue Nov 22 12:09:23 2011
***************
*** 817,823 ****
  		else \
  			echo "Setting set-UID bit on binaries."; \
  			chmod u+s $(DESTDIR)$(bindir)/oping || true; \
- 			chmod u+s $(DESTDIR)$(bindir)/noping || true; \
  		fi; \
  	fi
  
--- 817,822 ----
*** ./src/liboping.c.ORIG	Fri Apr 20 14:58:03 2012
--- ./src/liboping.c	Fri Apr 20 14:58:59 2012
***************
*** 447,452 ****
--- 447,457 ----
  	return (ptr);
  }
  
+ 
+ #if defined(_AIX) && !(defined(_AIX61) || defined(_AIX71))
+ #define IPV6_TCLASS             43   /* traffic class ancillary value */
+ #endif
+ 
  static int ping_receive_one (pingobj_t *obj, const pinghost_t *ph,
  		struct timeval *now)
  {
*** ./configure.ORIG	Fri Apr 20 14:59:16 2012
--- ./configure	Fri Apr 20 14:59:27 2012
***************
*** 11566,11572 ****
  esac
  
  
! $as_echo "#define malloc rpl_malloc" >>confdefs.h
  
  fi
  
--- 11566,11572 ----
  esac
  
  
! #$as_echo "#define malloc rpl_malloc" >>confdefs.h
  
  fi
  
*** ./src/oping.c.ORIG	Thu Dec 11 12:03:18 2014
--- ./src/oping.c	Thu Dec 11 12:04:24 2014
***************
*** 215,220 ****
--- 215,225 ----
  static WINDOW *main_win = NULL;
  #endif
  
+ #ifndef NAN
+ static  const unsigned int _SQNAN = 0x7fc00000;
+ #define NAN       (*((float *)(&_SQNAN)))
+ #endif
+ 
  static void sigint_handler (int signal) /* {{{ */
  {
  	/* Make compiler happy */