*** ./cherokee/error_log.h.ORIG	Thu Nov 18 21:04:36 2010
--- ./cherokee/error_log.h	Thu Nov 18 21:05:01 2010
***************
*** 50,56 ****
  #define CHEROKEE_ERROR(x) ((cherokee_error_t *)(x))
  
  
! #if defined(__GNUC__) || ( defined(__SUNPRO_C) && __SUNPRO_C > 0x590 )
  # define LOG_WARNING(e_num,arg...)     cherokee_error_log (cherokee_err_warning,  __FILE__, __LINE__, e_num, ##arg)
  # define LOG_WARNING_S(e_num)          cherokee_error_log (cherokee_err_warning,  __FILE__, __LINE__, e_num)
  # define LOG_ERROR(e_num,arg...)       cherokee_error_log (cherokee_err_error,    __FILE__, __LINE__, e_num, ##arg)
--- 50,56 ----
  #define CHEROKEE_ERROR(x) ((cherokee_error_t *)(x))
  
  
! #if defined(__GNUC__) || ( defined(__SUNPRO_C) && __SUNPRO_C > 0x590 ) || defined(_AIX)
  # define LOG_WARNING(e_num,arg...)     cherokee_error_log (cherokee_err_warning,  __FILE__, __LINE__, e_num, ##arg)
  # define LOG_WARNING_S(e_num)          cherokee_error_log (cherokee_err_warning,  __FILE__, __LINE__, e_num)
  # define LOG_ERROR(e_num,arg...)       cherokee_error_log (cherokee_err_error,    __FILE__, __LINE__, e_num, ##arg)
*** ./cherokee/util.c.ORIG	Thu Nov 18 21:12:23 2010
--- ./cherokee/util.c	Thu Nov 18 21:12:40 2010
***************
*** 2043,2049 ****
  
  
  int
! cherokee_stat (const char *restrict path, struct stat *buf)
  {
  	int re;
  
--- 2043,2049 ----
  
  
  int
! cherokee_stat (const char *path, struct stat *buf)
  {
  	int re;
  
***************
*** 2055,2061 ****
  }
  
  int
! cherokee_lstat (const char *restrict path, struct stat *buf)
  {
  	int re;
  
--- 2055,2061 ----
  }
  
  int
! cherokee_lstat (const char *path, struct stat *buf)
  {
  	int re;

*** cherokee/macros.h.ORIG      Thu Dec 30 11:17:23 2010
--- cherokee/macros.h   Thu Dec 30 11:17:42 2010
***************
*** 287,293 ****
  
  /* Printing macros
   */
! #if defined(__GNUC__) || ( defined(__SUNPRO_C) && __SUNPRO_C > 0x590 )
  # define PRINT_MSG(fmt,arg...)    do { fprintf(stderr, fmt, ##arg); fflush(stderr); } while(0)
  # define PRINT_ERROR(fmt,arg...)  do { fprintf(stderr, "%s:%d - "fmt, __FILE__, __LINE__, ##arg); fflush(stderr); } while(0)
  #else
--- 287,293 ----
  
  /* Printing macros
   */
! #if defined(__GNUC__) || ( defined(__SUNPRO_C) && __SUNPRO_C > 0x590 ) || defined(_AIX)
  # define PRINT_MSG(fmt,arg...)    do { fprintf(stderr, fmt, ##arg); fflush(stderr); } while(0)
  # define PRINT_ERROR(fmt,arg...)  do { fprintf(stderr, "%s:%d - "fmt, __FILE__, __LINE__, ##arg); fflush(stderr); } while(0)
  #else
*** ./cherokee/post.c.ORIG	Fri Nov 19 10:45:49 2010
--- ./cherokee/post.c	Fri Nov 19 10:46:12 2010
***************
*** 99,104 ****
--- 99,107 ----
  /* Methods
   */
  
+ #ifdef _AIX51
+ #define atoll(X) strtoll(X, (char **)NULL, 10)
+ #endif
  
  static ret_t
  parse_header (cherokee_post_t       *post,
*** ./cherokee/util.h.ORIG	Tue Feb  1 08:36:02 2011
--- ./cherokee/util.h	Tue Feb  1 08:36:13 2011
***************
*** 148,155 ****
  int   cherokee_readdir       (DIR *dirstream, struct dirent *entry, struct dirent **result);
  int   cherokee_closedir      (DIR *dirstream);
  
! int   cherokee_stat          (const char *restrict path, struct stat *buf);
! int   cherokee_lstat         (const char *restrict path, struct stat *buf);
  int   cherokee_fstat         (int filedes, struct stat *buf);
  int   cherokee_unlink        (const char *path);
  ret_t cherokee_gethostbyname (const char *hostname, void *addr);
--- 148,155 ----
  int   cherokee_readdir       (DIR *dirstream, struct dirent *entry, struct dirent **result);
  int   cherokee_closedir      (DIR *dirstream);
  
! int   cherokee_stat          (const char *path, struct stat *buf);
! int   cherokee_lstat         (const char *path, struct stat *buf);
  int   cherokee_fstat         (int filedes, struct stat *buf);
  int   cherokee_unlink        (const char *path);
  ret_t cherokee_gethostbyname (const char *hostname, void *addr);