diff --git a/libisoburn/trunk/xorriso/sfile.h b/libisoburn/trunk/xorriso/sfile.h
index a3bbfd0e..74cdb309 100644
--- a/libisoburn/trunk/xorriso/sfile.h
+++ b/libisoburn/trunk/xorriso/sfile.h
@@ -12,12 +12,12 @@
 #ifndef Xorriso_pvt_sfile_includeD
 #define Xorriso_pvt_sfile_includeD yes
 
-#define TSOB_FELD(typ,anz) (typ *) calloc(1, (anz)*sizeof(typ));
+#define TSOB_FELD(typ, count) (typ *) calloc(1, (count)*sizeof(typ));
 #define Smem_malloC malloc
 #define Smem_freE free
 
-#define Xorriso_alloc_meM(pt,typ,anz) { \
-  pt= (typ *) calloc(1, (anz)*sizeof(typ)); \
+#define Xorriso_alloc_meM(pt, typ, count) { \
+  pt= (typ *) calloc(1, (count) * sizeof(typ)); \
   if(pt == NULL) { \
     Xorriso_no_malloc_memory(xorriso, NULL, 0); \
     ret= -1; \
@@ -26,7 +26,7 @@
 
 #define Xorriso_free_meM(pt) { \
   if(pt != NULL) \
-    free(pt); \
+    free((char *) pt); \
   }
 
 
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 1f097e8e..4ef7590c 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.05.16.132939"
+#define Xorriso_timestamP "2011.05.16.133231"