From fef1907c39f7da9d7e17f54a3bdb57635456cf6a Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Wed, 18 Jul 2007 02:08:56 +0000
Subject: (svn r10607) -Fix r10605: use '&&' in preprocessor directives (MSVC
 doesn't like 'and')

---
 src/stdafx.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/stdafx.h')

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
-- 
cgit v1.2.3-70-g09d2