*** ./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;
*** ./ui/gtk/hostlist_table.c.ORIG	Fri Jun 22 12:08:59 2012
--- ./ui/gtk/hostlist_table.c	Fri Jun 22 12:09:48 2012
***************
*** 932,938 ****
      FILE              *out_file;
      gboolean           hosts_written;
      hostlist_table    *talkers;
! } map_t;
  
  /* XXX output in C locale */
  static gboolean
--- 932,938 ----
      FILE              *out_file;
      gboolean           hosts_written;
      hostlist_table    *talkers;
! } my_map_t;
  
  /* XXX output in C locale */
  static gboolean
***************
*** 939,945 ****
  map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
                gpointer data)
  {
!     map_t   *map = (map_t *)data;
      gchar   *table_entry, *esc_entry;
      guint64  value;
      /* Add the column values to the TSV data */
--- 939,945 ----
  map_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
                gpointer data)
  {
!     my_map_t   *map = (my_map_t *)data;
      gchar   *table_entry, *esc_entry;
      guint64  value;
      /* Add the column values to the TSV data */
***************
*** 1048,1054 ****
      GList             *columns, *list;
      GtkTreeViewColumn *column;
      GtkListStore      *store;
!     map_t              map;
      FILE              *tpl_file;
  
      map.talkers =g_object_get_data(G_OBJECT(copy_bt), HOST_PTR_KEY);
--- 1048,1054 ----
      GList             *columns, *list;
      GtkTreeViewColumn *column;
      GtkListStore      *store;
!     my_map_t           map;
      FILE              *tpl_file;
  
      map.talkers =g_object_get_data(G_OBJECT(copy_bt), HOST_PTR_KEY);
*** ./Makefile.in.ORIG	Thu Jun  6 08:24:35 2013
--- ./Makefile.in	Thu Jun  6 08:25:00 2013
***************
*** 1231,1237 ****
  	@LIBGNUTLS_LIBS@		\
  	@LIBSMI_LDFLAGS@		\
  	@PORTAUDIO_LIBS@		\
! 	@GTK_LIBS@			\
  	@Qt_LIBS@			\
  	@GLIB_LIBS@			\
  	-lm
--- 1231,1237 ----
  	@LIBGNUTLS_LIBS@		\
  	@LIBSMI_LDFLAGS@		\
  	@PORTAUDIO_LIBS@		\
! 	@GTK_LIBS@ -lgthread-2.0	\
  	@Qt_LIBS@			\
  	@GLIB_LIBS@			\
  	-lm