diff options
| author | glx <glx@openttd.org> | 2007-07-18 02:08:56 +0000 |
|---|---|---|
| committer | glx <glx@openttd.org> | 2007-07-18 02:08:56 +0000 |
| commit | fef1907c39f7da9d7e17f54a3bdb57635456cf6a (patch) | |
| tree | 149e1ece0248427782fc5daec1b4f219d8e819dc /src | |
| parent | bcc93b45bc7a2a6e01047cc30101e2528868065d (diff) | |
| download | openttd-fef1907c39f7da9d7e17f54a3bdb57635456cf6a.tar.xz | |
(svn r10607) -Fix r10605: use '&&' in preprocessor directives (MSVC doesn't like 'and')
Diffstat (limited to 'src')
| -rw-r--r-- | src/stdafx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index 22576e84b..7dae3ebdb 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -349,10 +349,10 @@ CDECL error(const char *str, ...); #define _stricmp strcasecmp #endif -#if !defined(MORPHOS) and !defined(OPENBSD) +#if !defined(MORPHOS) && !defined(OPENBSD) /* MorphOS & OpenBSD don't know wchars, the rest does :( */ #define HAS_WCHAR -#endif /* !defined(MORHPOS) and !defined(OPENBSD) */ +#endif /* !defined(MORPHOS) && !defined(OPENBSD) */ #if !defined(MAX_PATH) # define MAX_PATH 260 |