From: Jagger <robert@swiecki.net>
Date: Thu, 10 Mar 2016 21:57:08 +0000 (+0100)
Subject: Merge
X-Git-Tag: 1.2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bd1bca6dd83cf376e593e528b983ae35742ea29;p=platform%2Fupstream%2Fnsjail.git

Merge
---

5bd1bca6dd83cf376e593e528b983ae35742ea29
diff --cc common.h
index 4de570a,562d18d..8165c0a
--- a/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 {