Cleaner impl. of DEFER
diff --git a/common.h b/common.h
index ecf84bb..b871cf6 100644
--- a/common.h
+++ b/common.h
@@ -53,12 +53,12 @@
(*dfunc) ();
}
-#define defer(a) void (^_STRMERGE(__defer_f_, __COUNTER__))(void) __attribute__((cleanup(_clang_cleanup_func))) __attribute__((unused)) = ^{ a; }
+#define DEFER(a) void (^_STRMERGE(__defer_f_, __COUNTER__))(void) __attribute__((cleanup(_clang_cleanup_func))) __attribute__((unused)) = ^{ a; }
#else
#define __block
-#define _defer(a, count) void _STRMERGE(__defer_f_, count)(void *_defer_arg __attribute__((unused))) { a; } ; \
+#define _DEFER(a, count) void _STRMERGE(__defer_f_, count)(void *_defer_arg __attribute__((unused))) { a; } ; \
int _STRMERGE(_defer_var_, count) __attribute__((cleanup(_STRMERGE(__defer_f_, count)))) __attribute__((unused))
-#define defer(a) _defer(a, __COUNTER__)
+#define DEFER(a) _DEFER(a, __COUNTER__)
#endif
/* Name of the template which will be replaced with the proper name of the file */