More MSVC warning fixes:

1. DUPMAX is defined in regcomp.c, no need to redefine it in regutils.
2. MSVC doesn't like snprintf, use _snprintf instead.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81114 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Support/regcomp.c b/lib/Support/regcomp.c
index 9ae66f3fa5ff290df3b30f4495676bcddcde2653..16ca8d3f75c26f18ebd38455cb054c4ca0a04131 100644 (file)
--- a/lib/Support/regcomp.c
+++ b/lib/Support/regcomp.c
@@ -142,6 +142,7 @@ static char nuls[10];               /* place to point scanner in event of error */
 #else
 #define        DUPMAX  255
 #endif
+#define        INFINITY        (DUPMAX + 1)
 
 #ifndef NDEBUG
 static int never = 0;          /* for use in asserts; shuts lint up */

diff --git a/lib/Support/regerror.c b/lib/Support/regerror.c
index 88d33b8862aae09cbb24014e26bafd5864b33968..1d67c9a2b03b172ee2d5d0128bc1f48ac2508638 100644 (file)
--- a/lib/Support/regerror.c
+++ b/lib/Support/regerror.c
@@ -45,6 +45,10 @@
 
 #include "regutils.h"
 
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
 static const char *regatoi(const llvm_regex_t *, char *, int);
 
 static struct rerr {

diff --git a/lib/Support/regutils.h b/lib/Support/regutils.h
index 7150a3f08253ca9c57d6bb02c8436a76b4ea5d85..d0ee100a382b3432ce8c346b842adac9881e2a62 100644 (file)
--- a/lib/Support/regutils.h
+++ b/lib/Support/regutils.h
@@ -36,8 +36,6 @@
  */
 
 /* utility definitions */
-#define        DUPMAX          _POSIX2_RE_DUP_MAX      /* xxx is this right? */
-#define        INFINITY        (DUPMAX + 1)
 #define        NC              (CHAR_MAX - CHAR_MIN + 1)
 typedef unsigned char uch;