Merge pull request #11 from mikeplus64/master

Remove GLchar
haskell-opengl · Sep 13, 2012 · 89002d1 · 89002d1
2 parents e0ad085 + 5730ca4
commit 89002d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/OpenGLRaw.cabal b/OpenGLRaw.cabal
@@ -1,5 +1,5 @@
 name: OpenGLRaw
-version: 1.2.0.0
+version: 1.2.0.1
 license: BSD3
 license-file: LICENSE
 maintainer: Jason Dagit <dagitj@gmail.com>, Sven Panne <sven.panne@aedion.de>

diff --git a/src/Graphics/Rendering/OpenGL/Raw/Core31/TypesInternal.hs b/src/Graphics/Rendering/OpenGL/Raw/Core31/TypesInternal.hs
@@ -37,7 +37,6 @@ import Foreign.Ptr
 INTEGRAL_TYPE(GLbitfield,tyConGLbitfield,"GLbitfield",CUInt)
 INTEGRAL_TYPE(GLboolean,tyConGLboolean,"GLboolean",CUChar)
 INTEGRAL_TYPE(GLbyte,tyConGLbyte,"GLbyte",CSChar)
-INTEGRAL_TYPE(GLchar,tyConGLchar,"GLchar",CChar)
 FLOATING_TYPE(GLclampd,tyConGLclampd,"GLclampd",CDouble)
 FLOATING_TYPE(GLclampf,tyConGLclampf,"GLclampf",CFloat)
 FLOATING_TYPE(GLdouble,tyConGLdouble,"GLdouble",CDouble)
@@ -56,6 +55,7 @@ INTEGRAL_TYPE(GLint64,tyConGLint64,"GLint64",Int64)
 INTEGRAL_TYPE(GLuint64,tyConGLuint64,"GLuint64",Word64)
 
 newtype GLsync = GLSync (Ptr GLsync)
+type    GLchar = CChar
 
 -- Not part of the core, but it is very handy to define this here
 INTEGRAL_TYPE(GLhandle,tyConGLhandle,"GLhandle",CUInt)