diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-25 18:17:28 +0100 |
| commit | 65ca700def99289cc31a7040537f5aa6e12bf485 (patch) | |
| tree | 97b3a07299b626c519da0e80c122b5b79b933914 /sql/sql_callback.h | |
| parent | 2ab57de38d13d927ddff2d51aed4af34e13998f5 (diff) | |
| parent | 6e5bcca7935d3c62f84bb640e5357664a210ee12 (diff) | |
| download | mariadb-git-65ca700def99289cc31a7040537f5aa6e12bf485.tar.gz | |
merge.
checkpoint.
does not compile.
Diffstat (limited to 'sql/sql_callback.h')
| -rw-r--r-- | sql/sql_callback.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_callback.h b/sql/sql_callback.h index 430514d3d7e..834d8b74c7a 100644 --- a/sql/sql_callback.h +++ b/sql/sql_callback.h @@ -31,12 +31,9 @@ */ #define MYSQL_CALLBACK(OBJ, FUNC, PARAMS) \ - do { \ - if ((OBJ) && ((OBJ)->FUNC)) \ - (OBJ)->FUNC PARAMS; \ - } while (0) + (((OBJ) && ((OBJ)->FUNC)) ? (OBJ)->FUNC PARAMS : 0) -#define MYSQL_CALLBACK_ELSE(OBJ, FUNC, PARAMS, ELSE) \ +#define MYSQL_CALLBACK_ELSE0(OBJ, FUNC, PARAMS, ELSE) \ (((OBJ) && ((OBJ)->FUNC)) ? (OBJ)->FUNC PARAMS : (ELSE)) |