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 int bin_zselect _((char*nam,char**args,UNUSED(Options ops),UNUSED(int func)));