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 */
#ifndef have_Src_watch_globals
#define have_Src_watch_globals
extern char const*const default_watchfmt;
extern void dowatch _((void));
extern int bin_log _((UNUSED(char*nam),UNUSED(char**argv),UNUSED(Options ops),UNUSED(int func)));
extern void dowatch _((void));
extern int bin_log _((char*nam,char**argv,Options ops,int func));
#endif /* !have_Src_watch_globals */