Fix package building with clang

" #-}" is interpreted as unknown pragma by clang preprocessor, so fix package building in some cases, on os x mavericks for example.

Also automatically removed some trailing spaces