--- a/src/lib/error.h	Thu May 28 00:35:02 2009 +0300
+++ b/src/lib/error.h	Thu May 28 01:17:36 2009 +0300
@@ -89,7 +89,7 @@
 #define ERROR_TYPE_STRING(code, name) \
     { (code), (name), &error_extra_string, NULL }
 
-#define ERROR_TYPE_CUSTOM(code, name, type) \
+#define ERROR_TYPE_EXTRA(code, name, type) \
     { (code), (name), (type), NULL }
 
 #define ERROR_TYPE_SUB(code, name, sub) \
@@ -239,7 +239,7 @@
 
 /** Set the error with extra info as integer */
 #define SET_ERROR_EXTRA(err_state, err_list, err_code, err_extra_type, err_extra_int) ({ \
-        _ERROR_SET_EXTRA(err_state, err_list, err_code, err_extra_type, int_, err_extra);  \
+        _ERROR_SET_EXTRA(err_state, err_list, err_code, err_extra_type, int_, err_extra_int);  \
         err_code; })
 
 /** Set the error with extra info as the libc errno */