diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-11-09 18:29:18 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-11-09 18:29:18 -0700 |
| commit | 3cbe941717f0c8bd3b8e006abe5da75bc0f45a87 (patch) | |
| tree | c759d41bc84519584ef7ec467f533cdc5d65f0b4 /mysys/default.c | |
| parent | f7d4192585ef29b1525f799e7cad4a0e403e90b1 (diff) | |
| parent | dae9042bc6b5de886cc31b912a50c681966a065c (diff) | |
| download | mariadb-git-3cbe941717f0c8bd3b8e006abe5da75bc0f45a87.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50-fix
into ramayana.hindu.god:/home/tsmith/m/bk/build/51-fix
include/my_sys.h:
Auto merged
libmysql/CMakeLists.txt:
Auto merged
mysys/default.c:
Manual merge
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysys/default.c b/mysys/default.c index 550bd0c8865..1ff052d3d24 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1006,14 +1006,14 @@ static size_t my_get_system_windows_directory(char *buffer, size_t 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:/"); @@ -1046,7 +1046,7 @@ static void init_default_directories_win() last= end; } } - ADD_DIRECTORY(&config_dir); + ADD_DIRECTORY(config_dir); } ADD_COMMON_DIRECTORIES(); @@ -1067,7 +1067,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(); } @@ -1090,7 +1090,7 @@ static void (*init_default_directories)()= init_default_directories_netware; static void init_default_directories_unix() { - bzero(default_directories, sizeof(default_directories)); + bzero((char *) default_directories, sizeof(default_directories)); ADD_DIRECTORY("/etc/"); ADD_DIRECTORY("/etc/mysql/"); #ifdef DEFAULT_SYSCONFDIR |