summaryrefslogtreecommitdiffstats
path: root/generic/regguts.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-12-08 17:52:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-12-08 17:52:36 (GMT)
commit3df1a90364ee579fd64f37f49061fab042fd4647 (patch)
treef63ff64347762a52ad09abde4e031727526c05c5 /generic/regguts.h
parent804199d4b7c8ed967e5136c796a658fbbcfbb7c2 (diff)
parent0cd0bb6862a65142603ccbde70d3a894be70e9d4 (diff)
downloadtcl-3df1a90364ee579fd64f37f49061fab042fd4647.zip
tcl-3df1a90364ee579fd64f37f49061fab042fd4647.tar.gz
tcl-3df1a90364ee579fd64f37f49061fab042fd4647.tar.bz2
Bring back stub table in original state.
Merge trunk
Diffstat (limited to 'generic/regguts.h')
-rw-r--r--generic/regguts.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/generic/regguts.h b/generic/regguts.h
index 9461136..ad9d5b9 100644
--- a/generic/regguts.h
+++ b/generic/regguts.h
@@ -49,15 +49,6 @@
#include <assert.h>
#endif
-/* function-pointer declarator */
-#ifndef FUNCPTR
-#if __STDC__ >= 1
-#define FUNCPTR(name, args) (*name)args
-#else
-#define FUNCPTR(name, args) (*name)()
-#endif
-#endif
-
/* memory allocation */
#ifndef MALLOC
#define MALLOC(n) malloc(n)
@@ -391,7 +382,7 @@ struct subre {
*/
struct fns {
- void FUNCPTR(free, (regex_t *));
+ void (*free) (regex_t *);
};
/*
@@ -408,7 +399,7 @@ struct guts {
struct cnfa search; /* for fast preliminary search */
int ntree; /* number of subre's, plus one */
struct colormap cmap;
- int FUNCPTR(compare, (const chr *, const chr *, size_t));
+ int (*compare) (const chr *, const chr *, size_t);
struct subre *lacons; /* lookahead-constraint vector */
int nlacons; /* size of lacons */
};