summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/linenoise-ng
diff options
context:
space:
mode:
author dankan1890 <mewuidev2@gmail.com>2016-10-08 16:39:45 +0200
committer dankan1890 <mewuidev2@gmail.com>2016-10-08 16:39:45 +0200
commitcf92ae4a8aa0241231529bfa6c0cd26881e3c7fc (patch)
treefc2ecdcfcb361316a6391c7efb9a4c433dbc0e04 /3rdparty/linenoise-ng
parent2626c77bcb51e4e49bdb3a31dbfa5df83b094960 (diff)
linenoise: fixed build with VS ('and' isn't supported)
Diffstat (limited to '3rdparty/linenoise-ng')
-rw-r--r--3rdparty/linenoise-ng/src/linenoise.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/3rdparty/linenoise-ng/src/linenoise.cpp b/3rdparty/linenoise-ng/src/linenoise.cpp
index bdec55ff800..10ab72790bd 100644
--- a/3rdparty/linenoise-ng/src/linenoise.cpp
+++ b/3rdparty/linenoise-ng/src/linenoise.cpp
@@ -89,7 +89,7 @@
#include <conio.h>
#include <windows.h>
#include <io.h>
-#if defined(_MSC_VER) and (_MSC_VER < 1900)
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define snprintf _snprintf // Microsoft headers use underscores in some names
#endif
#define strcasecmp _stricmp