summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-02 12:22:17 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-02 12:22:17 +0300
commit3147bdd0ac34a5c62158b8c28da6ca77e0901f08 (patch)
tree919a1043e20b3f1f6a58331ae90a4a9529b0ab5e /include/my_global.h
parent2c6015e8dc962bef8f353af920581d9b6bd7fd82 (diff)
parent5bce1e06429c3d58457051f0c439f130609df375 (diff)
downloadmariadb-git-3147bdd0ac34a5c62158b8c28da6ca77e0901f08.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to 'include/my_global.h')
-rw-r--r--include/my_global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index b831960dbf8..a866fa1c25a 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -901,7 +901,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define FLT_MAX ((float)3.40282346638528860e+38)
#endif
#ifndef SIZE_T_MAX
-#define SIZE_T_MAX ~((size_t) 0)
+#define SIZE_T_MAX (~((size_t) 0))
#endif
#ifndef isfinite