diff options
| author | Tim Angus <tim@ngus.net> | 2016-04-09 17:57:28 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2016-04-09 17:57:28 +0100 |
| commit | f45fbef604e05144057dec8d1dbfc5d4f5a2a822 (patch) | |
| tree | 152d2a428b078f7a89756ea9e156695fc69f1686 /src/tools/lcc/cpp/unix.c | |
| parent | 7f9e97d611b4b267d9dd913144cb9632f96c90c2 (diff) | |
| parent | 87abdd914988724e164ffb16380ad26be8420b84 (diff) | |
Merge branch 'master' into gpp
Diffstat (limited to 'src/tools/lcc/cpp/unix.c')
| -rw-r--r-- | src/tools/lcc/cpp/unix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/lcc/cpp/unix.c b/src/tools/lcc/cpp/unix.c index 3e70b562..75e5b6d3 100644 --- a/src/tools/lcc/cpp/unix.c +++ b/src/tools/lcc/cpp/unix.c @@ -105,7 +105,8 @@ char *basepath( char *fname ) /* memmove is defined here because some vendors don't provide it at all and others do a terrible job (like calling malloc) */ // -- ouch, that hurts -- ln -#ifndef MACOS_X /* always use the system memmove() on Mac OS X. --ryan. */ +/* always use the system memmove() on Mac OS X. --ryan. */ +#if !defined(MACOS_X) && !defined(_MSC_VER) #ifdef memmove #undef memmove #endif |