diff options
| author | Mitesh Kanjariya <mitesh@cumulusnetworks.com> | 2018-03-12 14:47:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 14:47:28 -0700 |
| commit | 9bb3ca515b59b939c5d9941c4fdd4bd2f2dd38d1 (patch) | |
| tree | 5fb91642f1bbc24e10e74a768f46c659b215205b /lib/compiler.h | |
| parent | 7b1bf203ca189938b41811945fe6a71911574de3 (diff) | |
| parent | 9d16566bb3fbe7a9e15eb8d0cc51bcc3f7997e50 (diff) | |
Merge branch 'master' into type5-default-originate
Diffstat (limited to 'lib/compiler.h')
| -rw-r--r-- | lib/compiler.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/compiler.h b/lib/compiler.h index 49a2f2a422..773a52e742 100644 --- a/lib/compiler.h +++ b/lib/compiler.h @@ -21,25 +21,25 @@ * void prototype(void) __attribute__((_CONSTRUCTOR(100))); */ #if defined(__clang__) -# if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5) +#if __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 5) # define _RET_NONNULL , returns_nonnull -# endif +#endif # define _CONSTRUCTOR(x) constructor(x) #elif defined(__GNUC__) -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9) # define _RET_NONNULL , returns_nonnull -# endif -# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) +#endif +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) # define _CONSTRUCTOR(x) constructor(x) # define _DESTRUCTOR(x) destructor(x) # define _ALLOC_SIZE(x) alloc_size(x) -# endif +#endif #endif #ifdef __sun /* Solaris doesn't do constructor priorities due to linker restrictions */ -# undef _CONSTRUCTOR -# undef _DESTRUCTOR +#undef _CONSTRUCTOR +#undef _DESTRUCTOR #endif /* fallback versions */ |