diff options
| author | unknown <kent@mysql.com> | 2005-05-18 12:15:28 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-05-18 12:15:28 +0200 |
| commit | 17f37d95be4542b6b82bf1c765444441ef591837 (patch) | |
| tree | 4c62bb396d10168f837a89bd3b8fc3cf70a6f1ed /mysys | |
| parent | 37e5df797cd986ccffc4f998ff1cd1d3e0cb8aab (diff) | |
| download | mariadb-git-17f37d95be4542b6b82bf1c765444441ef591837.tar.gz | |
default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
Removed unused variable 'field' from print_warnings()
libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
Added "my_chsize.c"
VC++Files/client/mysqlclient.dsp:
Added "my_chsize.c"
VC++Files/libmysql/libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
client/mysql.cc:
Removed unused variable 'field' from print_warnings()
mysys/default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/default.c b/mysys/default.c index ba1a6c1513b..9d61401f3c1 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -986,10 +986,13 @@ static void init_default_directories() if (GetWindowsDirectory(system_dir,sizeof(system_dir))) *ptr++= &system_dir; +#if defined(_MSC_VER) && (_MSC_VER >= 1300) + /* Only VC7 and up */ /* Only add shared system directory if different from default. */ if (GetSystemWindowsDirectory(shared_system_dir,sizeof(shared_system_dir)) && strcmp(system_dir, shared_system_dir)) *ptr++= &shared_system_dir; +#endif #elif defined(__NETWARE__) *ptr++= "sys:/etc/"; |