*** ./p11-kit/debug.h.ORIG	Tue Nov 22 11:49:27 2011
--- ./p11-kit/debug.h	Tue Nov 22 11:50:03 2011
***************
*** 76,82 ****
  #undef _p11_debug
  #define _p11_debug(format, ...) do { \
  	if (DEBUG_FLAG & _p11_debug_current_flags) \
! 		_p11_debug_message (DEBUG_FLAG, "%s: " format, __PRETTY_FUNCTION__, ##__VA_ARGS__); \
  	} while (0)
  
  #undef _p11_debugging
--- 76,82 ----
  #undef _p11_debug
  #define _p11_debug(format, ...) do { \
  	if (DEBUG_FLAG & _p11_debug_current_flags) \
! 		_p11_debug_message (DEBUG_FLAG, "%s: " format, __FUNCTION__, ##__VA_ARGS__); \
  	} while (0)
  
  #undef _p11_debugging
*** ./tools/compat.c.ORIG	Tue Nov 22 11:55:40 2011
--- ./tools/compat.c	Tue Nov 22 11:58:21 2011
***************
*** 42,47 ****
--- 42,50 ----
  #include <stdio.h>
  #include <string.h>
  #include <stdarg.h>
+ #ifdef _AIX
+ #include <errno.h>
+ #endif
  
  static const char *
  calc_prog_name (void)
***************
*** 49,54 ****
--- 52,60 ----
  	static char prognamebuf[256];
  	static int prepared = 0;
  
+ #ifdef _AIX
+ 	strcpy( prognamebuf, "p11-kit-0.11" );
+ #else
  	if(!prepared)
  	{
  		const char* beg = strrchr(__argv[0], '\\');
***************
*** 66,71 ****
--- 72,78 ----
  		prognamebuf[temp - beg] = 0;
  		prepared = 1;
  	}
+ #endif
  
  	return prognamebuf;
  }