--- deliantra/Deliantra-Client/Client.xs	2014/12/24 06:12:21	1.318
+++ deliantra/Deliantra-Client/Client.xs	2018/11/18 00:52:22	1.319
@@ -186,7 +186,7 @@
     
   while (attrs)
     {
-      PangoAttribute *attr = attrs->data;
+      PangoAttribute *attr = (PangoAttribute *)attrs->data;
 
       if (attr->klass->type == PANGO_ATTR_SHAPE)
         return 1;
@@ -891,10 +891,11 @@
 void SDL_Quit ()
 
 int SDL_GL_SetAttribute (int attr, int value)
+	C_ARGS: (SDL_GLattr)attr, value
 
 int SDL_GL_GetAttribute (int attr)
 	CODE:
-        if (SDL_GL_GetAttribute (attr, &RETVAL))
+        if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
           XSRETURN_UNDEF;
         OUTPUT:
         RETVAL
@@ -977,6 +978,7 @@
 
 char *
 SDL_GetKeyName (int sym)
+	C_ARGS: (SDLKey)sym
 
 int
 SDL_GetAppState ()
@@ -1214,7 +1216,7 @@
         EXTEND (SP, 6);
         PUSHs (sv_2mortal (newSViv (surface2->w)));
         PUSHs (sv_2mortal (newSViv (surface2->h)));
-        PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
+        PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
         PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
         PUSHs (sv_2mortal (newSViv (GL_RGBA)));
         PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
@@ -1296,7 +1298,7 @@
 PROTOTYPES: DISABLE
 
 DC::Font
-new_from_file (SV *class, char *path, int id = 0)
+new_from_file (SV *klass, char *path, int id = 0)
 	CODE:
 {
         int count;
@@ -1335,7 +1337,7 @@
         tc_restore ();
 
 DC::Layout
-new (SV *class)
+new (SV *klass)
 	CODE:
         New (0, RETVAL, 1, struct cf_layout);
 
@@ -1868,7 +1870,7 @@
 PROTOTYPES: DISABLE
 
 DC::Map
-new (SV *class)
+new (SV *klass)
 	CODE:
         New (0, RETVAL, 1, struct map);
         RETVAL->x  = 0;
@@ -2744,7 +2746,7 @@
 
         len = SvLEN (data_sv);
         SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
-        data = SvPVbyte_nolen (data_sv);
+        data = (uint8_t *)SvPVbyte_nolen (data_sv);
         end = data + len + 8;
 
         if (len < 5)
@@ -2815,7 +2817,7 @@
 MODULE = Deliantra::Client	PACKAGE = DC::RW
 
 DC::RW
-new (SV *class, SV *data_sv)
+new (SV *klass, SV *data_sv)
 	CODE:
 {
         STRLEN datalen;
@@ -2827,7 +2829,7 @@
         RETVAL
 
 DC::RW
-new_from_file (SV *class, const char *path, const char *mode = "rb")
+new_from_file (SV *klass, const char *path, const char *mode = "rb")
 	CODE:
         RETVAL = SDL_RWFromFile (path, mode);
 	OUTPUT:
@@ -2946,7 +2948,7 @@
 #endif
 
 DC::MixChunk
-new (SV *class, DC::RW rwops)
+new (SV *klass, DC::RW rwops)
 	CODE:
         RETVAL = Mix_LoadWAV_RW (rwops, 1);
 	OUTPUT:
@@ -3026,7 +3028,7 @@
         RETVAL
 
 DC::MixMusic
-new (SV *class, DC::RW rwops)
+new (SV *klass, DC::RW rwops)
 	CODE:
         RETVAL = Mix_LoadMUS_RW (rwops);
 	OUTPUT:
@@ -3189,28 +3191,32 @@
 void
 apple_nvidia_bug (int enable)
 
-char *
+const char *
 gl_vendor ()
 	CODE:
-        RETVAL = (char *)glGetString (GL_VENDOR);
+        RETVAL = (const char *)glGetString (GL_VENDOR);
 	OUTPUT:
         RETVAL
 
-char *
+const char *
 gl_version ()
 	CODE:
-        RETVAL = (char *)glGetString (GL_VERSION);
+        RETVAL = (const char *)glGetString (GL_VERSION);
 	OUTPUT:
         RETVAL
 
-char *
+const char *
 gl_extensions ()
 	CODE:
-        RETVAL = (char *)glGetString (GL_EXTENSIONS);
+        RETVAL = (const char *)glGetString (GL_EXTENSIONS);
 	OUTPUT:
         RETVAL
 
 const char *glGetString (GLenum pname)
+	CODE:
+        RETVAL = (const char *)glGetString (pname);
+	OUTPUT:
+        RETVAL
 
 GLint glGetInteger (GLenum pname)
 	CODE: