From 9f7b295e4621171c7f1f96ecc7c47d95cd2872d0 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Fri, 29 Jan 2010 09:46:58 +0000
Subject: Fix macro conflict on CYGWIN: don't use "small".
---
ChangeLog | 9 +++++----
generic/rege_dfa.c | 24 ++++++++++++------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f98b1ec..aa42db1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
2010-01-29 Jan Nijtmans <nijtmans@users.sf.net>
- * generic/tcl.h Use correct TCL_LL_MODIFIER for CYGWIN.
- Formatting (all backported from HEAD)
- * generic/tclTest.c: Fix gcc 4.4 warning: ignoring return value of ‘write’,
- * unix/tclUnixPipe.c
+ * generic/tcl.h Use correct TCL_LL_MODIFIER for CYGWIN.
+ Formatting (all backported from HEAD)
+ * generic/rege_dfa.c: Fix macro conflict on CYGWIN: don't use "small".
+ * generic/tclTest.c: Fix gcc 4.4 warning: ignoring return value of
+ * unix/tclUnixPipe.c ‘write’
* unix/tclUnixNotify.c
2010-01-19 Donal K. Fellows <dkf@users.sf.net>
diff --git a/generic/rege_dfa.c b/generic/rege_dfa.c
index c80996a..e233680 100644
--- a/generic/rege_dfa.c
+++ b/generic/rege_dfa.c
@@ -318,32 +318,32 @@ newdfa(
struct vars *v,
struct cnfa *cnfa,
struct colormap *cm,
- struct smalldfa *small) /* preallocated space, may be NULL */
+ struct smalldfa *sml) /* preallocated space, may be NULL */
{
struct dfa *d;
size_t nss = cnfa->nstates * 2;
int wordsper = (cnfa->nstates + UBITS - 1) / UBITS;
- struct smalldfa *smallwas = small;
+ struct smalldfa *smallwas = sml;
assert(cnfa != NULL && cnfa->nstates != 0);
if (nss <= FEWSTATES && cnfa->ncolors <= FEWCOLORS) {
assert(wordsper == 1);
- if (small == NULL) {
- small = (struct smalldfa *) MALLOC(sizeof(struct smalldfa));
- if (small == NULL) {
+ if (sml == NULL) {
+ sml = (struct smalldfa *) MALLOC(sizeof(struct smalldfa));
+ if (sml == NULL) {
ERR(REG_ESPACE);
return NULL;
}
}
- d = &small->dfa;
- d->ssets = small->ssets;
- d->statesarea = small->statesarea;
+ d = &sml->dfa;
+ d->ssets = sml->ssets;
+ d->statesarea = sml->statesarea;
d->work = &d->statesarea[nss];
- d->outsarea = small->outsarea;
- d->incarea = small->incarea;
+ d->outsarea = sml->outsarea;
+ d->incarea = sml->incarea;
d->cptsmalloced = 0;
- d->mallocarea = (smallwas == NULL) ? (char *)small : NULL;
+ d->mallocarea = (smallwas == NULL) ? (char *)sml : NULL;
} else {
d = (struct dfa *)MALLOC(sizeof(struct dfa));
if (d == NULL) {
@@ -388,7 +388,7 @@ newdfa(
/*
- freedfa - free a DFA
- ^ static VOID freedfa(struct dfa *);
+ ^ static void freedfa(struct dfa *);
*/
static void
freedfa(
--
cgit v0.12