summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
authorelliot@mysql.com <>2006-06-23 17:27:54 -0400
committerelliot@mysql.com <>2006-06-23 17:27:54 -0400
commitd4796d9df60847cf1479fa90b971574ea32b85d6 (patch)
treee98cbbc277ba262a672f9a1aaef14d025bf1bc24 /regex
parentebe57fc7070dfbd8a6822e027654aec297b94eed (diff)
parent6043f29810a910a2dd4650f31bf8784db5526539 (diff)
downloadmariadb-git-d4796d9df60847cf1479fa90b971574ea32b85d6.tar.gz
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1
Diffstat (limited to 'regex')
-rw-r--r--regex/regexec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/regexec.c b/regex/regexec.c
index b7ad83ba883..88bcc02323d 100644
--- a/regex/regexec.c
+++ b/regex/regexec.c
@@ -19,7 +19,7 @@ static int nope = 0; /* for use in asserts; shuts lint up */
/* macros for manipulating states, small version */
#define states long
-#define states1 states /* for later use in regexec() decision */
+#define states1 long /* for later use in regexec() decision. Ensure Win64 definition is correct.*/
#define CLEAR(v) ((v) = 0)
#define SET0(v, n) ((v) &= ~((states) 1 << (n)))
#define SET1(v, n) ((v) |= (states) 1 << (n))