Changes to get Cairo building on OSX again
Merge pull request #32 from staticfloat/sf/sourcefixes

Changes to get Cairo building on OSX again