These are the 2 patches for renaming functions and gpsd support throught conditional compilation. Dario.