diff options
author | unknown <reggie@monster.> | 2005-06-06 11:34:52 -0500 |
---|---|---|
committer | unknown <reggie@monster.> | 2005-06-06 11:34:52 -0500 |
commit | 6e82d648635706021684cf3d0af3527e617f282c (patch) | |
tree | 7fe15c14e9a6363110d49c2354c0b202ab80c4ce /mysys/default.c | |
parent | 22eeea04903dc0275387fd26cd7bd9cdc8f40f50 (diff) | |
download | mariadb-git-6e82d648635706021684cf3d0af3527e617f282c.tar.gz |
fixes for compiler warnings from VC6
client/mysqltest.c:
undef popen prior to redefining it to avoid compiler warning
cast len argument to replace_dynstr_append_mem to int. This should be ok because the
replace_dynstr_append method uses strlen to accomplish the same thing.
myisam/mi_create.c:
cast myisam_block_size down to uint16 to match the struct element block_length
mysys/default.c:
add (char*) cast to make compiler happy
mysys/my_handler.c:
add (my_bool) cast to make compiler happy
Diffstat (limited to 'mysys/default.c')
-rw-r--r-- | mysys/default.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index e28161ba7b0..ab9bdaf0ed2 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -850,7 +850,7 @@ static void init_default_directories() *ptr++= "C:/"; if (GetWindowsDirectory(system_dir,sizeof(system_dir))) - *ptr++= &system_dir; + *ptr++= (char*)&system_dir; #if defined(_MSC_VER) && (_MSC_VER >= 1300) /* Only VC7 and up */ /* Only add shared system directory if different from default. */ |