summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-07-18 02:08:56 +0000
committerglx <glx@openttd.org>2007-07-18 02:08:56 +0000
commitd8690139b4858bb2b8fe22fcbe6fe0be287efc0a (patch)
tree149e1ece0248427782fc5daec1b4f219d8e819dc /src
parentb6d6e407ad34d76b7ce476ffb269852183f857bf (diff)
downloadopenttd-d8690139b4858bb2b8fe22fcbe6fe0be287efc0a.tar.xz
(svn r10607) -Fix r10605: use '&&' in preprocessor directives (MSVC doesn't like 'and')
Diffstat (limited to 'src')
-rw-r--r--src/stdafx.h4
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