diff options
Diffstat (limited to 'generic/regcustom.h')
| -rw-r--r-- | generic/regcustom.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/generic/regcustom.h b/generic/regcustom.h index 57a2d47..681b97d 100644 --- a/generic/regcustom.h +++ b/generic/regcustom.h @@ -30,16 +30,16 @@ * Headers if any. */ -#include "tclInt.h" +#include "regex.h" /* * Overrides for regguts.h definitions, if any. */ #define FUNCPTR(name, args) (*name)args -#define MALLOC(n) ckalloc(n) +#define MALLOC(n) VS(attemptckalloc(n)) #define FREE(p) ckfree(VS(p)) -#define REALLOC(p,n) ckrealloc(VS(p),n) +#define REALLOC(p,n) VS(attemptckrealloc(VS(p),n)) /* * Do not insert extras between the "begin" and "end" lines - this chunk is @@ -60,12 +60,6 @@ #ifdef __REG_REGOFF_T #undef __REG_REGOFF_T #endif -#ifdef __REG_VOID_T -#undef __REG_VOID_T -#endif -#ifdef __REG_CONST -#undef __REG_CONST -#endif #ifdef __REG_NOFRONT #undef __REG_NOFRONT #endif @@ -75,8 +69,6 @@ /* Interface types */ #define __REG_WIDE_T Tcl_UniChar #define __REG_REGOFF_T long /* Not really right, but good enough... */ -#define __REG_VOID_T void -#define __REG_CONST const /* Names and declarations */ #define __REG_WIDE_COMPILE TclReComp #define __REG_WIDE_EXEC TclReExec @@ -155,7 +147,9 @@ typedef int celt; /* Type to hold chr, or NOCELT */ #endif /* - * And pick up the standard header. + * Local Variables: + * mode: c + * c-basic-offset: 4 + * fill-column: 78 + * End: */ - -#include "regex.h" |