diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-27 23:34:12 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-27 23:34:12 +0100 |
| commit | ea4c84eadafd4673165232d01d811a6a7c5ddf9f (patch) | |
| tree | 432acab1ed6fe07e9087cf7577c8910fcfbb6900 /include/my_global.h | |
| parent | 099c888967557c164e11cb0ca7d895898be6edc9 (diff) | |
| parent | 1561ee5c56875a2d136170a357167700d62f0a01 (diff) | |
| download | mariadb-git-ea4c84eadafd4673165232d01d811a6a7c5ddf9f.tar.gz | |
Merge mysql.com:/misc/mysql/mysql-5.1
into mysql.com:/misc/mysql/mysql-5.1-opt
CMakeLists.txt:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index 00d1ea25c7a..d9a8aeca881 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1067,7 +1067,7 @@ typedef uint8 int7; /* Most effective integer 0 <= x <= 127 */ typedef short int15; /* Most effective integer 0 <= x <= 32767 */ typedef int myf; /* Type of MyFlags in my_funcs */ typedef char my_bool; /* Small bool */ -#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) +#if !defined(bool) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) typedef char bool; /* Ordinary boolean values 0 1 */ #endif /* Macros for converting *constants* to the right type */ |