*** ./xorriso/xorriso_private.h.ORIG	Mon Jan 31 10:46:27 2011
--- ./xorriso/xorriso_private.h	Mon Jan 31 10:46:40 2011
***************
*** 20,26 ****
--- 20,28 ----
  
  
  /* for uint32_t */
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  
  /** The source code release timestamp */
*** ./xorriso/base_obj.c.ORIG	Mon Jan 31 10:47:22 2011
--- ./xorriso/base_obj.c	Mon Jan 31 10:47:36 2011
***************
*** 25,31 ****
--- 25,33 ----
  #include <sys/time.h>
  #include <time.h>
  #include <errno.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  #ifdef Xorriso_standalonE
  
*** ./xorriso/lib_mgt.c.ORIG	Mon Jan 31 10:47:49 2011
--- ./xorriso/lib_mgt.c	Mon Jan 31 10:48:03 2011
***************
*** 23,29 ****
--- 23,31 ----
  #include <sys/time.h>
  #include <time.h>
  #include <errno.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  /* for -charset */
  #include <iconv.h>
*** ./xorriso/write_run.c.ORIG	Mon Jan 31 10:48:23 2011
--- ./xorriso/write_run.c	Mon Jan 31 10:48:33 2011
***************
*** 25,31 ****
--- 25,33 ----
  #include <errno.h>
  
  #include <fcntl.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  #ifdef Xorriso_standalonE
  
*** ./libjte/checksum.c.ORIG	Mon Jan 31 11:01:49 2011
--- ./libjte/checksum.c	Mon Jan 31 11:02:04 2011
***************
*** 17,23 ****
--- 17,25 ----
  #include <stdlib.h>
  #include <string.h>
  #include <errno.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include "md5.h"
  #include "sha1.h"
  #include "sha256.h"
*** ./libjte/endian.c.ORIG	Mon Jan 31 11:02:19 2011
--- ./libjte/endian.c	Mon Jan 31 11:06:43 2011
***************
*** 12,18 ****
--- 12,22 ----
  #include "../config.h"
  #endif
  
+ #ifndef _AIX51
  #include <stdint.h>
+ #else
+ #include <inttypes.h>
+ #endif
  #include "endianconv.h"
  
  /* Write a 64-bit quantity out into memory in BIG ENDIAN order */
*** ./libjte/jte.c.ORIG	Mon Jan 31 11:02:25 2011
--- ./libjte/jte.c	Mon Jan 31 11:03:30 2011
***************
*** 22,28 ****
--- 22,30 ----
  #include "../config.h"
  #endif
  
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <string.h>
  #include <stdlib.h>
  
*** ./libjte/libjte.c.ORIG	Mon Jan 31 11:02:31 2011
--- ./libjte/libjte.c	Mon Jan 31 11:03:39 2011
***************
*** 19,25 ****
--- 19,27 ----
  #include <unistd.h>
  #include <string.h>
  #include <stdlib.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <errno.h>
  
  
*** ./libjte/md5.c.ORIG	Mon Jan 31 11:02:35 2011
--- ./libjte/md5.c	Mon Jan 31 11:03:53 2011
***************
*** 51,57 ****
--- 51,59 ----
  #include <stdio.h>
  #include <errno.h>
  #include <stdlib.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  #include "md5.h"
  
*** ./libjte/rsync.c.ORIG	Mon Jan 31 11:02:40 2011
--- ./libjte/rsync.c	Mon Jan 31 11:04:01 2011
***************
*** 15,21 ****
--- 15,23 ----
  #endif
  
  #include <ctype.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <string.h>
  
  #include "rsync.h"
*** ./libjte/sha1.c.ORIG	Mon Jan 31 11:02:44 2011
--- ./libjte/sha1.c	Mon Jan 31 11:04:13 2011
***************
*** 38,44 ****
--- 38,46 ----
  #include <stdlib.h>
  #include <string.h>
  #ifdef HAVE_STDINT_H 
+ # ifndef _AIX51
  # include <stdint.h>
+ # endif
  #endif
  #include "sha1.h"
  
*** ./libjte/sha256.h.ORIG	Mon Jan 31 11:02:49 2011
--- ./libjte/sha256.h	Mon Jan 31 11:04:22 2011
***************
*** 26,32 ****
--- 26,34 ----
  #define _SHA256_H 1
  
  #include <limits.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdio.h>
  
  
*** ./libjte/sha512.h.ORIG	Mon Jan 31 11:02:54 2011
--- ./libjte/sha512.h	Mon Jan 31 11:04:30 2011
***************
*** 26,32 ****
--- 26,34 ----
  #define _SHA512_H 1
  
  #include <limits.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdio.h>
  
  
*** ./libisoburn/isoburn.h.ORIG	Mon Jan 31 10:48:54 2011
--- ./libisoburn/isoburn.h	Mon Jan 31 10:49:10 2011
***************
*** 12,18 ****
--- 12,20 ----
  
  
  /* for uint8_t */
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  /* For emulated TOC of overwriteable media.
     Provides minimal info for faking a struct burn_toc_entry.
*** ./libisoburn/data_source.c.ORIG	Mon Jan 31 13:04:52 2011
--- ./libisoburn/data_source.c	Mon Jan 31 13:05:02 2011
***************
*** 249,255 ****
   ret->version = 0;
   ret->refcount = 1;
   ret->read_block = ds_read_block;
!  ret->open = ds_open;
   ret->close = ds_close;
   ret->free_data = ds_free_data;
   ret->data = icd;
--- 249,255 ----
   ret->version = 0;
   ret->refcount = 1;
   ret->read_block = ds_read_block;
!  ret->AIXopen = ds_open;
   ret->close = ds_close;
   ret->free_data = ds_free_data;
   ret->data = icd;
*** ./libisofs/libisofs.h.ORIG	Mon Jan 31 10:45:47 2011
--- ./libisofs/libisofs.h	Mon Jan 31 12:59:13 2011
***************
*** 28,34 ****
--- 28,36 ----
  #define LIBISO_LIBISOFS_H_
  
  #include <sys/stat.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdlib.h>
  
  struct burn_source;
***************
*** 289,295 ****
       * @return
       *      1 if success, < 0 on error (has to be a valid libisofs error code)
       */
!     int (*open)(IsoDataSource *src);
  
      /**
       * Close a given source, freeing all system resources previously grabbed in
--- 291,297 ----
       * @return
       *      1 if success, < 0 on error (has to be a valid libisofs error code)
       */
!     int (*AIXopen)(IsoDataSource *src);
  
      /**
       * Close a given source, freeing all system resources previously grabbed in
***************
*** 458,464 ****
       *
       * @return 1 on success, < 0 on error (has to be a valid libisofs error code)
       */
!     int (*open)(IsoFilesystem *fs);
  
      /**
       * Close the filesystem, thus freeing all system resources. You should
--- 460,466 ----
       *
       * @return 1 on success, < 0 on error (has to be a valid libisofs error code)
       */
!     int (*AIXopen)(IsoFilesystem *fs);
  
      /**
       * Close the filesystem, thus freeing all system resources. You should
***************
*** 578,584 ****
       *         ISO_FILE_ERROR
       *         ISO_NULL_POINTER
       */
!     int (*open)(IsoFileSource *src);
  
      /**
       * Close a previuously openned file
--- 580,586 ----
       *         ISO_FILE_ERROR
       *         ISO_NULL_POINTER
       */
!     int (*AIXopen)(IsoFileSource *src);
  
      /**
       * Close a previuously openned file
***************
*** 824,830 ****
       *     1 on success, 2 file greater than expected, 3 file smaller than
       *     expected, < 0 on error (has to be a valid libisofs error code)
       */
!     int (*open)(IsoStream *stream);
  
      /**
       * Close the Stream.
--- 826,832 ----
       *     1 on success, 2 file greater than expected, 3 file smaller than
       *     expected, < 0 on error (has to be a valid libisofs error code)
       */
!     int (*AIXopen)(IsoStream *stream);
  
      /**
       * Close the Stream.
*** ./libisofs/node.h.ORIG	Mon Jan 31 10:49:49 2011
--- ./libisofs/node.h	Mon Jan 31 10:50:06 2011
***************
*** 20,26 ****
--- 20,28 ----
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <unistd.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  /**
   * The extended information is a way to attach additional information to each
*** ./libisofs/util.h.ORIG	Mon Jan 31 10:50:14 2011
--- ./libisofs/util.h	Mon Jan 31 11:09:22 2011
***************
*** 11,17 ****
--- 11,19 ----
  #ifndef LIBISO_UTIL_H_
  #define LIBISO_UTIL_H_
  
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <time.h>
  
  #ifndef MAX
*** ./libisofs/buffer.h.ORIG	Mon Jan 31 10:50:45 2011
--- ./libisofs/buffer.h	Mon Jan 31 10:50:58 2011
***************
*** 11,17 ****
--- 11,19 ----
  #define LIBISO_BUFFER_H_
  
  #include <stdlib.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  #define BLOCK_SIZE          2048
  
*** ./libisofs/ecma119.h.ORIG	Mon Jan 31 10:51:06 2011
--- ./libisofs/ecma119.h	Mon Jan 31 10:51:21 2011
***************
*** 15,21 ****
--- 15,23 ----
  #include "util.h"
  #include "buffer.h"
  
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <pthread.h>
  
  #define BLOCK_SIZE      2048
*** ./libisofs/filesrc.h.ORIG	Mon Jan 31 10:51:31 2011
--- ./libisofs/filesrc.h	Mon Jan 31 10:51:42 2011
***************
*** 13,19 ****
--- 13,21 ----
  #include "stream.h"
  #include "ecma119.h"
  
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  
  struct Iso_File_Src
  {
*** ./libisofs/md5.c.ORIG	Mon Jan 31 11:07:46 2011
--- ./libisofs/md5.c	Mon Jan 31 11:07:56 2011
***************
*** 12,18 ****
--- 12,20 ----
  #include "../config.h"
  #endif
  
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <stdlib.h>
  #include <string.h>
  #include <stdio.h>
*** ./libisofs/fsource.c.ORIG	Mon Jan 31 13:06:21 2011
--- ./libisofs/fsource.c	Mon Jan 31 13:06:32 2011
***************
*** 82,88 ****
  inline
  int iso_file_source_open(IsoFileSource *src)
  {
!     return src->class->open(src);
  }
  
  inline
--- 82,88 ----
  inline
  int iso_file_source_open(IsoFileSource *src)
  {
!     return src->class->AIXopen(src);
  }
  
  inline
*** ./libisofs/fs_local.c.ORIG	Mon Jan 31 12:59:35 2011
--- ./libisofs/fs_local.c	Mon Jan 31 12:59:44 2011
***************
*** 756,762 ****
          lfs->get_root = lfs_get_root;
          lfs->get_by_path = lfs_get_by_path;
          lfs->get_id = lfs_get_id;
!         lfs->open = lfs_fs_open;
          lfs->close = lfs_fs_close;
          lfs->free = lfs_fs_free;
      }
--- 756,762 ----
          lfs->get_root = lfs_get_root;
          lfs->get_by_path = lfs_get_by_path;
          lfs->get_id = lfs_get_id;
!         lfs->AIXopen = lfs_fs_open;
          lfs->close = lfs_fs_close;
          lfs->free = lfs_fs_free;
      }
*** ./libisofs/fs_image.c.ORIG	Mon Jan 31 13:00:01 2011
--- ./libisofs/fs_image.c	Mon Jan 31 13:00:30 2011
***************
*** 605,611 ****
  
      if (S_ISDIR(data->info.st_mode)) {
          /* ensure fs is openned */
!         ret = data->fs->open(data->fs);
          if (ret < 0) {
              return ret;
          }
--- 605,611 ----
  
      if (S_ISDIR(data->info.st_mode)) {
          /* ensure fs is openned */
!         ret = data->fs->AIXopen(data->fs);
          if (ret < 0) {
              return ret;
          }
***************
*** 628,634 ****
          return ret;
      } else if (S_ISREG(data->info.st_mode)) {
          /* ensure fs is openned */
!         ret = data->fs->open(data->fs);
          if (ret < 0) {
              return ret;
          }
--- 628,634 ----
          return ret;
      } else if (S_ISREG(data->info.st_mode)) {
          /* ensure fs is openned */
!         ret = data->fs->AIXopen(data->fs);
          if (ret < 0) {
              return ret;
          }
***************
*** 1928,1934 ****
  
      if (data->open_count == 0) {
          /* we need to actually open the data source */
!         int res = data->src->open(data->src);
          if (res < 0) {
              return res;
          }
--- 1928,1934 ----
  
      if (data->open_count == 0) {
          /* we need to actually open the data source */
!         int res = data->src->AIXopen(data->src);
          if (res < 0) {
              return res;
          }
***************
*** 2448,2454 ****
      ifs->get_root = ifs_get_root;
      ifs->get_by_path = ifs_get_by_path;
      ifs->get_id = ifs_get_id;
!     ifs->open = ifs_fs_open;
      ifs->close = ifs_fs_close;
      ifs->free = ifs_fs_free;
  
--- 2448,2454 ----
      ifs->get_root = ifs_get_root;
      ifs->get_by_path = ifs_get_by_path;
      ifs->get_id = ifs_get_id;
!     ifs->AIXopen = ifs_fs_open;
      ifs->close = ifs_fs_close;
      ifs->free = ifs_fs_free;
  
*** ./libisofs/stream.c.ORIG	Mon Jan 31 13:00:44 2011
--- ./libisofs/stream.c	Mon Jan 31 13:01:03 2011
***************
*** 621,627 ****
  inline
  int iso_stream_open(IsoStream *stream)
  {
!     return stream->class->open(stream);
  }
  
  inline
--- 621,627 ----
  inline
  int iso_stream_open(IsoStream *stream)
  {
!     return stream->class->AIXopen(stream);
  }
  
  inline
*** ./libisofs/util.c.ORIG	Mon Jan 31 11:09:07 2011
--- ./libisofs/util.c	Mon Jan 31 11:09:47 2011
***************
*** 49,54 ****
--- 49,93 ----
  };
  
  
+ /***************************************************************************
+                                  unsetenv()
+  ****************************************************************************/
+ 
+ #ifdef _AIX51
+ int
+ unsetenv( const char *name )
+ {
+   size_t len;
+   char **ep;
+ 
+   if ((name == NULL) || (*name == '\0') || (strchr( name, '=' ) != NULL))
+   {
+     errno = EINVAL;
+     return( -1 );
+   }
+ 
+   len = strlen( name );
+ 
+   ep = environ;
+   while (*ep != NULL)
+     if (! strncmp( *ep, name, len ) && (*ep)[len] == '=')
+     {
+ /* Found it.  Remove this pointer by moving later ones back.  */
+       char **dp = ep;
+ 
+       do
+         dp[0] = dp[1];
+       while (*dp++);
+ /* Continue the loop in case NAME appears again.  */
+     }
+   else
+     ++ep;
+ 
+   return( 0 );
+ }
+ #endif
+ 
+ 
  /*
     @param flag    bit0= shortcut by identical mapping is not allowed
  */
*** ./libisofs/data_source.c.ORIG	Mon Jan 31 13:01:23 2011
--- ./libisofs/data_source.c	Mon Jan 31 13:01:29 2011
***************
*** 190,196 ****
      ds->refcount = 1;
      ds->data = data;
  
!     ds->open = ds_open;
      ds->close = ds_close;
      ds->read_block = ds_read_block;
      ds->free_data = ds_free_data;
--- 190,196 ----
      ds->refcount = 1;
      ds->data = data;
  
!     ds->AIXopen = ds_open;
      ds->close = ds_close;
      ds->read_block = ds_read_block;
      ds->free_data = ds_free_data;
*** ./libisofs/make_isohybrid_mbr.c.ORIG	Mon Jan 31 11:07:12 2011
--- ./libisofs/make_isohybrid_mbr.c	Mon Jan 31 11:07:27 2011
***************
*** 4,10 ****
--- 4,12 ----
  #endif
  
  #include <ctype.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <sys/types.h>
  #include <stdlib.h>
  #include <stdio.h>