diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
| commit | 4ec2e9d7eda78d409d1b017ef4d8928fe9055438 (patch) | |
| tree | 6c3a74a740d3c1c5f3a7d1f8154d8a791b435b3f /include/my_global.h | |
| parent | 1a2a9d74fe1256554eceb09bbc6752a6376df87d (diff) | |
| parent | 197bdbae4db78ba65f3668803bebd3c4a4509ae5 (diff) | |
| download | mariadb-git-4ec2e9d7eda78d409d1b017ef4d8928fe9055438.tar.gz | |
5.5 merge and fixes for compiler/test errors
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/my_global.h b/include/my_global.h index e5c832edc8b..cefd963b5be 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2001, 2012, Oracle and/or its affiliates. + Copyright (c) 2001, 2013, Oracle and/or its affiliates. Copyright (c) 2010, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify @@ -306,7 +306,7 @@ C_MODE_END #define ulonglong2double(A) my_ulonglong2double(A) #define my_off_t2double(A) my_ulonglong2double(A) C_MODE_START -inline double my_ulonglong2double(unsigned long long A) { return (double A); } +inline double my_ulonglong2double(unsigned long long A) { return (double)A; } C_MODE_END #endif /* _AIX */ @@ -399,8 +399,7 @@ C_MODE_END #define compile_time_assert(X) \ do \ { \ - typedef char compile_time_assert[(X) ? 1 : -1] \ - __attribute__((unused)); \ + typedef char compile_time_assert[(X) ? 1 : -1] __attribute__((unused)); \ } while(0) #endif @@ -1508,4 +1507,11 @@ static inline double rint(double x) #endif /* EMBEDDED_LIBRARY */ +/* + Define default tmpdir if not already set. +*/ +#if !defined(DEFAULT_TMPDIR) +#define DEFAULT_TMPDIR P_tmpdir +#endif + #endif /* my_global_h */ |