Fixed switch so gcc doesn't complain.

Put the GF_NUMBER branch inside the switch.
I kind of agree with gcc on this.
removed erroneous comma
Fixed building on linux