*** ./glib/gatomic.c.ORIG	Thu Feb 10 13:22:21 2011
--- ./glib/gatomic.c	Thu Feb 10 13:22:36 2011
***************
*** 27,32 ****
--- 27,33 ----
  #include <sched.h>
  #endif
  
+ #include "glib.h"
  #include "gatomic.h"
  #include "gthreadprivate.h"
  
*** ./gio/gsocket.c.ORIG	Thu Feb 10 14:51:22 2011
--- ./gio/gsocket.c	Thu Feb 10 14:51:44 2011
***************
*** 56,61 ****
--- 56,65 ----
  #include "gcredentials.h"
  #include "glibintl.h"
  
+ #if (defined(_AIX51) || defined(_AIX52)) && !(defined(_AIX53) || defined(_AIX61))
+ #define ss_family __ss_family
+ #endif
+ 
  /**
   * SECTION:gsocket
   * @short_description: Low-level socket object
*** ./gobject/gobject.c.ORIG	Fri Nov  9 00:19:44 2012
--- ./gobject/gobject.c	Fri Nov  9 00:20:50 2012
***************
*** 175,181 ****
  static guint               object_floating_flag_handler (GObject        *object,
                                                           gint            job);
  
! static void object_interface_check_properties           (gpointer        func_data,
  							 gpointer        g_iface);
  
  /* --- typedefs --- */
--- 175,181 ----
  static guint               object_floating_flag_handler (GObject        *object,
                                                           gint            job);
  
! static void object_interface_check_properties           (gpointer        AIX_func_data,
  							 gpointer        g_iface);
  
  /* --- typedefs --- */
***************
*** 1360,1366 ****
  }
  
  static void
! object_interface_check_properties (gpointer func_data,
  				   gpointer g_iface)
  {
    GTypeInterface *iface_class = g_iface;
--- 1360,1366 ----
  }
  
  static void
! object_interface_check_properties (gpointer AIX_func_data,
  				   gpointer g_iface)
  {
    GTypeInterface *iface_class = g_iface;
*** ./configure.ORIG	Fri Nov  9 00:29:03 2012
--- ./configure	Fri Nov  9 00:30:01 2012
***************
*** 23556,23573 ****
  fi
  done
  
- # Check for high-resolution sleep functions
- for ac_func in splice
- do :
-   ac_fn_c_check_func "$LINENO" "splice" "ac_cv_func_splice"
- if test "x$ac_cv_func_splice" = xyes; then :
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_SPLICE 1
- _ACEOF
- 
- fi
- done
- 
  for ac_func in prlimit
  do :
    ac_fn_c_check_func "$LINENO" "prlimit" "ac_cv_func_prlimit"
--- 23556,23561 ----
***************
*** 26381,26386 ****
--- 26369,26378 ----
      *-*-cygwin*|*-*-darwin*)
         # skip cygwin and darwin -pthread or -pthreads test
         ;;
+     *-aix*)
+       G_THREAD_CFLAGS="-qthreaded -D_THREAD_SAFE"
+       G_THREAD_LIBS="-lpthread"
+       ;;
      *-solaris*)
        # These compiler/linker flags work with both Sun Studio and gcc
        # Sun Studio expands -mt to -D_REENTRANT and -lthread
*** ./glib/gconstructor.h.ORIG	Fri Nov  9 08:51:23 2012
--- ./glib/gconstructor.h	Fri Nov  9 08:50:37 2012
***************
*** 62,68 ****
    static int _func ## _constructor(void) { atexit (_func); return 0; } \
    __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
  
! #elif defined(__SUNPRO_C)
  
  /* This is not tested, but i believe it should work, based on:
   * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
--- 62,68 ----
    static int _func ## _constructor(void) { atexit (_func); return 0; } \
    __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
  
! #elif defined(__SUNPRO_C) || defined(__VACPP_MULTI__)
  
  /* This is not tested, but i believe it should work, based on:
   * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c