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 time_t getlogtime _((WATCH_STRUCT_UTMP*u,int inout));
static char*watch3ary _((int inout,WATCH_STRUCT_UTMP*u,char*fmt,int prnt));
static char*watchlog2 _((int inout,WATCH_STRUCT_UTMP*u,char*fmt,int prnt,int fini));
static void watchlog _((int inout,WATCH_STRUCT_UTMP*u,char**w,char*fmt));
static int ucmp _((WATCH_STRUCT_UTMP*u,WATCH_STRUCT_UTMP*v));
static void readwtab _((void));