diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-11-09 18:27:20 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-11-09 18:27:20 -0700 |
| commit | dae9042bc6b5de886cc31b912a50c681966a065c (patch) | |
| tree | 9ec269ab550279b0351d72a6b2a03d4e13b3bf80 /mysys/default.c | |
| parent | 3a7e070f53565c225b19bd633effbd21d2822b10 (diff) | |
| download | mariadb-git-dae9042bc6b5de886cc31b912a50c681966a065c.tar.gz | |
Fix Windows build problems.
libmysql/CMakeLists.txt:
Add new mysys/mf_arr_appstr.c source file
mysys/default.c:
Fix some bad code that caused warnings on Windows
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mysys/default.c b/mysys/default.c index 74d016ce53c..a24f6583004 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -997,14 +997,14 @@ static uint my_get_system_windows_directory(char *buffer, uint size) static void init_default_directories_win() { - bzero(default_directories, sizeof(default_directories)); + bzero((char *) default_directories, sizeof(default_directories)); if (my_get_system_windows_directory(shared_system_dir, sizeof(shared_system_dir))) - ADD_DIRECTORY(&shared_system_dir); + ADD_DIRECTORY(shared_system_dir); if (GetWindowsDirectory(system_dir,sizeof(system_dir))) - ADD_DIRECTORY(&system_dir); + ADD_DIRECTORY(system_dir); ADD_DIRECTORY("C:/"); @@ -1037,7 +1037,7 @@ static void init_default_directories_win() last= end; } } - ADD_DIRECTORY(&config_dir); + ADD_DIRECTORY(config_dir); } ADD_COMMON_DIRECTORIES(); @@ -1058,7 +1058,7 @@ static void (*init_default_directories)()= init_default_directories_win; static void init_default_directories_netware() { - bzero(default_directories, sizeof(default_directories)); + bzero((char *) default_directories, sizeof(default_directories)); ADD_DIRECTORY("sys:/etc/"); ADD_COMMON_DIRECTORIES(); } @@ -1081,7 +1081,7 @@ static void init_default_directories_os2() { const char *env; - bzero(default_directories, sizeof(default_directories)); + bzero((char *) default_directories, sizeof(default_directories)); ADD_DIRECTORY("/etc/"); if ((env= getenv("ETC"))) ADD_DIRECTORY(env); @@ -1105,7 +1105,7 @@ static void (*init_default_directories)()= init_default_directories_os2; static void init_default_directories_unix() { - bzero(default_directories, sizeof(default_directories)); + bzero((char *) default_directories, sizeof(default_directories)); ADD_DIRECTORY("/etc/"); #ifdef DEFAULT_SYSCONFDIR if (DEFAULT_SYSCONFDIR != "") |