Merge pull request #183 from c0d1f1ed/gl-gles-now-kiss

Fix conflicting type declarations in GL and GLES