summaryrefslogtreecommitdiff
path: root/include/my_global.h
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-12-17 18:09:04 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-12-17 18:09:04 +0300
commit5069a666709a66335ded54c6fab4832e155840c1 (patch)
tree4d0f676967368da9dbb6b7ddde1033a278f2e17c /include/my_global.h
parent7e15d855f1fbc72bae6c0ee75dd2b61477c2eaff (diff)
parent709f49cbf780681bb74707c9ab2438f163747906 (diff)
downloadmariadb-git-5069a666709a66335ded54c6fab4832e155840c1.tar.gz
Automerge from mysql-5.1-bugteam to mysql-trunk-merge.
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 f6d1592fc6f..d3d17721ea9 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -900,7 +900,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