diff options
| author | unknown <guilhem@gbichot4.local> | 2008-02-19 00:00:58 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-02-19 00:00:58 +0100 |
| commit | 0ab7c2f3a834ea3fd6e0f1b1b2da511c4e0e97f2 (patch) | |
| tree | a1a8c21e5474b1f95b6b21530ade595853f81767 /include/config-win.h | |
| parent | 34fff04d033e042ee89f7ffcd326285e59495c6a (diff) | |
| download | mariadb-git-0ab7c2f3a834ea3fd6e0f1b1b2da511c4e0e97f2.tar.gz | |
Merge from 5.1-build of the "my_bool for C" changeset.
Removing "#define bool BOOL" as it's dangerous.
include/config-win.h:
This #define was confusing: a) it changes the semantics of bool but
only on Windows (C++ standard says that casting int to bool to int
yields 0 or 1, but if using BOOL (which is int) this breaks, see
old BUG 11567 "Variable 'foreign_key_checks', and other variables,
differs binlog tests") b) it is not needed in C++ which has a bool type
c) it is not needed in C where we must use my_bool as bool either does
not exist or changes size between C and C++.
storage/maria/ma_check.c:
my_bool for C
storage/maria/ma_dynrec.c:
my_bool for C
storage/maria/ma_search.c:
my_bool for C
storage/maria/ma_write.c:
my_bool for C
storage/maria/maria_def.h:
my_bool for C
storage/maria/maria_pack.c:
my_bool for C
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index 7a50f28c932..779f02fc5a0 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -168,7 +168,6 @@ typedef uint rf_SetTimer; #define Socket_defined #define my_socket SOCKET -#define bool BOOL #define SIGPIPE SIGINT #define RETQSORTTYPE void #define QSORT_TYPE_IS_VOID |