Merge

diff --cc common.h
index 4de570a40201c58076c0b3a9bd775be3ff284616,562d18d99af3f04f761140f4df72e2190593c569..8165c0a14ef80e370909886f6bb4cae0648f9394
--- 1/common.h
--- 2/common.h
+++ b/common.h
@@@ -38,15 -38,15 +38,15 @@@
  #ifdef __clang__
  static void __attribute__ ((unused)) _clang_cleanup_func(void (^*dfunc) (void))
  {
-       (*dfunc) ();
+     (*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
  
  struct pids_t {