[llvm-commits] [llvm] r81114 - in /llvm/trunk/lib/Support: regcomp.c regerror.c regutils.h

[Benjamin Kramer]

Author: d0k
Date: Sun Sep  6 07:26:28 2009
New Revision: 81114

URL: http://llvm.org/viewvc/llvm-project?rev=81114&view=rev
Log:
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.

Modified:
    llvm/trunk/lib/Support/regcomp.c
    llvm/trunk/lib/Support/regerror.c
    llvm/trunk/lib/Support/regutils.h

Modified: llvm/trunk/lib/Support/regcomp.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/regcomp.c?rev=81114&r1=81113&r2=81114&view=diff

==============================================================================
--- llvm/trunk/lib/Support/regcomp.c (original)
+++ llvm/trunk/lib/Support/regcomp.c Sun Sep  6 07:26:28 2009
@@ -142,6 +142,7 @@
 #else
 #define	DUPMAX	255
 #endif
+#define	INFINITY	(DUPMAX + 1)
 
 #ifndef NDEBUG
 static int never = 0;		/* for use in asserts; shuts lint up */

Modified: llvm/trunk/lib/Support/regerror.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/regerror.c?rev=81114&r1=81113&r2=81114&view=diff

==============================================================================
--- llvm/trunk/lib/Support/regerror.c (original)
+++ llvm/trunk/lib/Support/regerror.c Sun Sep  6 07:26:28 2009
@@ -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 {

Modified: llvm/trunk/lib/Support/regutils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/regutils.h?rev=81114&r1=81113&r2=81114&view=diff

==============================================================================
--- llvm/trunk/lib/Support/regutils.h (original)
+++ llvm/trunk/lib/Support/regutils.h Sun Sep  6 07:26:28 2009
@@ -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;