diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-25 11:06:16 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-25 11:06:16 -0400 |
| commit | 4f1c1975b5f3d98321ad9e5b6f952c166d3606a7 (patch) | |
| tree | 50c83e846f4a4d538b94bce41201d4a2847a852d /include | |
| parent | 9c89b84d46e0645820acb9e3cc339af10c68cfb7 (diff) | |
| parent | 0991e19e9d38f7475390276c0557c2390e4d93c9 (diff) | |
| download | mariadb-git-4f1c1975b5f3d98321ad9e5b6f952c166d3606a7.tar.gz | |
Merge tag 'mariadb-5.5.49' into 5.5-galera
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 14 | ||||
| -rw-r--r-- | include/probes_mysql_nodtrace.h.in (renamed from include/probes_mysql_nodtrace.h) | 0 |
2 files changed, 0 insertions, 14 deletions
diff --git a/include/my_global.h b/include/my_global.h index 9e9651b7409..dce38a124c1 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -207,20 +207,6 @@ #define likely(x) __builtin_expect(((x) != 0),1) #define unlikely(x) __builtin_expect(((x) != 0),0) -/* - now let's figure out if inline functions are supported - autoconf defines 'inline' to be empty, if not -*/ -#define inline_test_1(X) X ## 1 -#define inline_test_2(X) inline_test_1(X) -#if inline_test_2(inline) != 1 -#define HAVE_INLINE -#else -#error Compiler does not support inline! -#endif -#undef inline_test_2 -#undef inline_test_1 - /* Fix problem with S_ISLNK() on Linux */ #if defined(TARGET_OS_LINUX) || defined(__GLIBC__) #undef _GNU_SOURCE diff --git a/include/probes_mysql_nodtrace.h b/include/probes_mysql_nodtrace.h.in index a84bf7726c3..a84bf7726c3 100644 --- a/include/probes_mysql_nodtrace.h +++ b/include/probes_mysql_nodtrace.h.in |