diff options
author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-14 01:21:56 +0200 |
---|---|---|
committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-14 01:21:56 +0200 |
commit | 4e1d88af8fe7ec0eac3902bb72a067e8d191bf3a (patch) | |
tree | 0270e09eab428c2cabfaaffbd159a30650434127 /sql/sql_string.h | |
parent | 67183a7b8a0f08267a165f1edc075f75ba746e44 (diff) | |
download | mariadb-git-4e1d88af8fe7ec0eac3902bb72a067e8d191bf3a.tar.gz |
Netware specific changes.
sql/ha_archive.cc:
Disabled archive db for Netware until
zlibCompileFlags() is available for this platform.
sql/sql_string.h:
Added casts. Won't work with Metrowerks compiler without.
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r-- | sql/sql_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 67c3e0c62f2..0659f684afe 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -24,7 +24,7 @@ #define NOT_FIXED_DEC 31 #endif -#define STRING_WITH_LEN(X) ((char*) X), (sizeof(X)-1) +#define STRING_WITH_LEN(X) ((const char*) X), ((uint) (sizeof(X) - 1)) class String; int sortcmp(const String *a,const String *b, CHARSET_INFO *cs); |