*** ./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;
*** ./gtk/hostlist_table.c.ORIG	Sat Oct 29 10:48:43 2011
--- ./gtk/hostlist_table.c	Sat Oct 29 10:49:07 2011
***************
*** 918,924 ****
      FILE              *out_file;
      gboolean           hosts_written;
      hostlist_table    *talkers;
! } map_t;
  
  /* XXX output in C locale */
  static gboolean
--- 918,924 ----
      FILE              *out_file;
      gboolean           hosts_written;
      hostlist_table    *talkers;
! } my_map_t;
  
  /* XXX output in C locale */
  static gboolean
***************
*** 925,931 ****
  map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
                gpointer data)
  {
!     map_t   *map = (map_t *)data;
      gchar   *table_entry;
      guint64  value;
      /* Add the column values to the TSV data */
--- 925,931 ----
  map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
                gpointer data)
  {
!     my_map_t   *map = (my_map_t *)data;
      gchar   *table_entry;
      guint64  value;
      /* Add the column values to the TSV data */
***************
*** 1012,1018 ****
      GList             *columns, *list;
      GtkTreeViewColumn *column;
      GtkListStore      *store;
!     map_t              map;
  
      map.talkers =g_object_get_data(G_OBJECT(copy_bt), HOST_PTR_KEY);
      if (!map.talkers)
--- 1012,1018 ----
      GList             *columns, *list;
      GtkTreeViewColumn *column;
      GtkListStore      *store;
!     my_map_t              map;
  
      map.talkers =g_object_get_data(G_OBJECT(copy_bt), HOST_PTR_KEY);
      if (!map.talkers)
*** ./epan/Makefile.in.ORIG	Sat Nov 19 22:12:58 2011
--- ./epan/Makefile.in	Sat Nov 19 22:13:37 2011
***************
*** 323,329 ****
  KRB5_LIBS = @KRB5_LIBS@
  LAUNCHSERVICES_FRAMEWORKS = @LAUNCHSERVICES_FRAMEWORKS@
  LD = @LD@
! LDFLAGS = @LDFLAGS@
  LDFLAGS_SHAREDLIB = @LDFLAGS_SHAREDLIB@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
--- 323,329 ----
  KRB5_LIBS = @KRB5_LIBS@
  LAUNCHSERVICES_FRAMEWORKS = @LAUNCHSERVICES_FRAMEWORKS@
  LD = @LD@
! LDFLAGS = @LDFLAGS@ -Wl,-bbigtoc
  LDFLAGS_SHAREDLIB = @LDFLAGS_SHAREDLIB@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
*** ./gtk/main.c.ORIG	Sat Nov 19 23:32:00 2011
--- ./gtk/main.c	Sat Nov 19 23:32:40 2011
***************
*** 43,49 ****
--- 43,51 ----
  #endif
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
*** ./tshark.c.ORIG	Sat Nov 19 23:48:58 2011
--- ./tshark.c	Sat Nov 19 23:49:13 2011
***************
*** 52,58 ****
--- 52,60 ----
  #endif
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
*** ./mergecap.c.ORIG	Sat Nov 19 23:50:02 2011
--- ./mergecap.c	Sat Nov 19 23:50:37 2011
***************
*** 28,34 ****
--- 28,36 ----
  #include "wtap.h"
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
*** ./text2pcap.c.ORIG	Sat Nov 19 23:50:10 2011
--- ./text2pcap.c	Sat Nov 19 23:50:25 2011
***************
*** 126,132 ****
--- 126,134 ----
  #include <assert.h>
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
*** ./capinfos.c.ORIG	Sat Nov 19 23:51:05 2011
--- ./capinfos.c	Sat Nov 19 23:51:22 2011
***************
*** 80,86 ****
--- 80,88 ----
  #endif
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
*** ./Makefile.in.ORIG	Sun Nov 20 00:01:26 2011
--- ./Makefile.in	Sun Nov 20 00:01:14 2011
***************
*** 422,428 ****
  KRB5_LIBS = @KRB5_LIBS@
  LAUNCHSERVICES_FRAMEWORKS = @LAUNCHSERVICES_FRAMEWORKS@
  LD = @LD@
! LDFLAGS = @LDFLAGS@
  LDFLAGS_SHAREDLIB = @LDFLAGS_SHAREDLIB@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
--- 422,428 ----
  KRB5_LIBS = @KRB5_LIBS@
  LAUNCHSERVICES_FRAMEWORKS = @LAUNCHSERVICES_FRAMEWORKS@
  LD = @LD@
! LDFLAGS = @LDFLAGS@ -Wl,-brtl
  LDFLAGS_SHAREDLIB = @LDFLAGS_SHAREDLIB@
  LEX = @LEX@
  LEXLIB = @LEXLIB@
*** ./editcap.c.ORIG	Sun Nov 20 00:01:42 2011
--- ./editcap.c	Sun Nov 20 00:01:57 2011
***************
*** 43,49 ****
--- 43,51 ----
  #include "wtap.h"
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
*** ./randpkt.c.ORIG	Sun Nov 20 00:02:33 2011
--- ./randpkt.c	Sun Nov 20 00:02:47 2011
***************
*** 28,34 ****
--- 28,36 ----
  #endif
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
*** ./dumpcap.c.ORIG	Sun Nov 20 00:03:16 2011
--- ./dumpcap.c	Sun Nov 20 00:03:31 2011
***************
*** 60,66 ****
--- 60,68 ----
  #include <errno.h>
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
*** ./rawshark.c.ORIG	Sun Nov 20 00:04:12 2011
--- ./rawshark.c	Sun Nov 20 00:04:27 2011
***************
*** 62,68 ****
--- 62,70 ----
  #endif
  
  #ifdef HAVE_GETOPT_H
+ #ifndef _AIX51
  #include <getopt.h>
+ #endif
  #else
  #include "wsutil/wsgetopt.h"
  #endif
