summaryrefslogtreecommitdiffstats
path: root/generic/regguts.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-29 13:03:15 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-29 13:03:15 (GMT)
commiteca25ffa988872763ee91c496912bf2d22a0819f (patch)
tree327d2fb917db2580f8f17afb3d093f83a87f35c0 /generic/regguts.h
parentb91af81bc4ee0138c07c96e938c4878e0a8c06d9 (diff)
downloadtcl-eca25ffa988872763ee91c496912bf2d22a0819f.zip
tcl-eca25ffa988872763ee91c496912bf2d22a0819f.tar.gz
tcl-eca25ffa988872763ee91c496912bf2d22a0819f.tar.bz2
Minor simplifications. Eliminate FUNCPRT from regexp engine. Fix compile-error (non-debug) in tclDictObj.c, from previous commit
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 */
};