- fixed macro calls to get along with astyle
Merge branch 'master' of github.com:Oslandia/SFCGAL

Conflicts:
	test/regress/garden/main.cpp