Bug 1699 - Fix redefinition of uInt by replacing 2nd def with inclusion of 1st. Also fixed numerous other over qualification of method name and token pasting issues which cause GCCE errors.
/* Generated automatically */
static void taddchr _((int c));
static void taddstr _((char*s));
static void taddlist _((Estate state,int num));
static void taddnl _((void));
static void gettext2 _((Estate state));