diff options
| author | unknown <kaa@polly.(none)> | 2007-10-02 13:39:00 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-02 13:39:00 +0400 |
| commit | 309b7b1604896e2a18205c474def27a432f8ad04 (patch) | |
| tree | 717e314d66b77757c8ca777071d2b428ca468f29 /include/my_global.h | |
| parent | b76788a942d0cdc22dd7bd632ffc81dff645f6d8 (diff) | |
| parent | 79fcc28560292235b979faebb9eba12e8bd70e42 (diff) | |
| download | mariadb-git-309b7b1604896e2a18205c474def27a432f8ad04.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 12129523939..5979f6e5a3c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -854,8 +854,8 @@ typedef SOCKET_SIZE_TYPE size_socket; #define DBL_MAX 1.79769313486231470e+308 #define FLT_MAX ((float)3.40282346638528860e+38) #endif -#ifndef SSIZE_MAX -#define SSIZE_MAX ((~((size_t) 0)) / 2) +#ifndef SIZE_T_MAX +#define SIZE_T_MAX ~((size_t) 0) #endif #ifndef HAVE_FINITE |