diff options
| author | unknown <jimw@mysql.com> | 2005-05-18 17:13:31 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-18 17:13:31 -0700 |
| commit | e05de07e0def470aef7ad6f04fb340c0ac093a9a (patch) | |
| tree | c740a12e239b2b930d23bdca85357315f1680f5a /mysys/default.c | |
| parent | 38c78b8bb9ac4615ddb6f45ffb9a1ac0d217af0f (diff) | |
| parent | 6e1e571b3516c705684fd4e745af355f9875afee (diff) | |
| download | mariadb-git-e05de07e0def470aef7ad6f04fb340c0ac093a9a.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-build
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysys/default.c:
Auto merged
server-tools/instance-manager/commands.cc:
Auto merged
Diffstat (limited to 'mysys/default.c')
| -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 a9f3f4092ef..e28161ba7b0 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -851,10 +851,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/"; |