*** lib/fsplib/fsplib.c.ORIG	Tue Aug 14 16:20:15 2007
--- lib/fsplib/fsplib.c	Tue Aug 14 16:22:25 2007
***************
*** 593,603 ****
  
      /* convert FSP dirent to OS dirent */
  
      if (fentry.type == FSP_RDTYPE_DIR )
  	entry->d_type=DT_DIR;
      else
  	entry->d_type=DT_REG;
! 	
      /* remove symlink destination */
      c=strchr(fentry.name,'\n');
      if (c)
--- 593,605 ----
  
      /* convert FSP dirent to OS dirent */
  
+ #ifndef _AIX
      if (fentry.type == FSP_RDTYPE_DIR )
  	entry->d_type=DT_DIR;
      else
  	entry->d_type=DT_REG;
! #endif
! 
      /* remove symlink destination */
      c=strchr(fentry.name,'\n');
      if (c)
***************
*** 608,613 ****
--- 610,618 ----
  	fentry.namlen-=rc;
      }
  
+ #ifdef _AIX
+ #define d_fileno        d_ino   /* Backwards compatibility.  */
+ #endif
      entry->d_fileno = 10;
      entry->d_reclen = fentry.reclen;
      strncpy(entry->d_name,fentry.name,MAXNAMLEN);
*** lib/fsplib/lock.c.ORIG	Fri Aug 17 11:23:27 2007
--- lib/fsplib/lock.c	Fri Aug 17 10:15:15 2007
***************
*** 46,51 ****
--- 46,55 ----
  #include <sys/stat.h>
  #include <unistd.h>
  
+ #ifdef _AIX
+ #define _SEM_SEMUN_UNDEFINED
+ #endif
+ 
  #ifdef _SEM_SEMUN_UNDEFINED
  union semun
  {
*** src/gtk/misc-gtk.c.ORIG	Fri Aug 17 10:17:34 2007
--- src/gtk/misc-gtk.c	Fri Aug 17 10:18:52 2007
***************
*** 555,563 ****
  
  
  static gchar *
! gftp_item_factory_translate (const char *path, gpointer func_data)
  {
!   const gchar *strip_prefix = func_data;
    const char *result;
    
    if (strip_prefix)
--- 555,563 ----
  
  
  static gchar *
! gftp_item_factory_translate (const char *path, gpointer AIX_func_data)
  {
!   const gchar *strip_prefix = AIX_func_data;
    const char *result;
    
    if (strip_prefix)
*** lib/protocols.c.ORIG	Thu Aug 23 20:52:13 2007
--- lib/protocols.c	Thu Aug 23 21:07:18 2007
***************
*** 411,416 ****
--- 411,420 ----
  }
  
  
+ #ifdef _AIX
+ #define GLIB_MAJOR_VERSION 1
+ #endif
+ 
  #if GLIB_MAJOR_VERSION > 1
  
  static char *
*** src/gtk/options_dialog.c.ORIG	Thu Aug 23 21:09:36 2007
--- src/gtk/options_dialog.c	Thu Aug 23 21:09:45 2007
***************
*** 1002,1008 ****
    gtk_widget_show (box);
    
  #if GTK_MAJOR_VERSION == 1
!   tempwid = gtk_label_new (_("Type:"))
  #else
    tempwid = gtk_label_new_with_mnemonic (_("_Type:"));
  #endif
--- 1002,1008 ----
    gtk_widget_show (box);
    
  #if GTK_MAJOR_VERSION == 1
!   tempwid = gtk_label_new (_("Type:"));
  #else
    tempwid = gtk_label_new_with_mnemonic (_("_Type:"));
  #endif
*** src/text/gftp-text.c.ORIG	Thu Aug 23 20:51:35 2007
--- src/text/gftp-text.c	Thu Aug 23 20:51:56 2007
***************
*** 185,191 ****
--- 185,193 ----
    else
      infd = stdin;
  
+ #ifndef _AIX
    locale_question = g_locale_from_utf8 (question, -1, NULL, NULL, NULL);
+ #endif
    if (locale_question != NULL)
      {
        printf ("%s%s%s ", GFTPUI_COMMON_COLOR_BLUE, locale_question,