*** ./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)
