Changeset 20879 in vbox for trunk

Timestamp:

Jun 24, 2009 7:40:43 AM (16 years ago)

Author:

vboxsync

Message:

gcc warnings

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu.h (modified) (1 diff)
• packspu_getstring.c (modified) (7 diffs)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.h

@@ -40 +40 @@
     CRContext *clientState;  /* used to store client-side GL state */
     GLint serverCtx;         /* context ID returned by server */
-    char glVersion[100];     /* GL_VERSION string */
-    char pszRealVendor[100];
-    char pszRealVersion[100];
-    char pszRealRenderer[100];
+    GLubyte glVersion[100];     /* GL_VERSION string */
+    GLubyte pszRealVendor[100];
+    GLubyte pszRealVersion[100];
+    GLubyte pszRealRenderer[100];
 };
 

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c

@@ -16 +16 @@
 #endif
 
-static void GetString(GLenum name, char *pszStr)
+static void GetString(GLenum name, GLubyte *pszStr)
 {
     GET_THREAD(thread);
@@ -83 +83 @@
         if (fversion>=2.f)
         {
-            sprintf(gpszExtensions, "%sGL_ARB_shading_language_100 GL_ARB_shader_objects GL_ARB_vertex_shader GL_ARB_fragment_shader", ext);
+            sprintf((char*)gpszExtensions, "%sGL_ARB_shading_language_100 GL_ARB_shader_objects GL_ARB_vertex_shader GL_ARB_fragment_shader", ext);
         }
     }
@@ -113 +113 @@
             {
                 GetString(GL_REAL_VERSION, ctx->pszRealVersion);
-                return (const GLubyte*) ctx->pszRealVersion;               
+                return ctx->pszRealVersion;               
             }
             else
@@ -119 +119 @@
             {
                 float version = GetVersionString();
-                sprintf(ctx->glVersion, "%.1f Chromium %s", version, CR_VERSION_STRING);
-                return (const GLubyte *) ctx->glVersion;
+                sprintf((char*)ctx->glVersion, "%.1f Chromium %s", version, CR_VERSION_STRING);
+                return ctx->glVersion;
             }
         case GL_VENDOR:
@@ -127 +127 @@
             {
                 GetString(GL_REAL_VENDOR, ctx->pszRealVendor);
-                return (const GLubyte*) ctx->pszRealVendor;
+                return ctx->pszRealVendor;
             }
             else
@@ -139 +139 @@
             {
                 GetString(GL_REAL_RENDERER, ctx->pszRealRenderer);
-                return (const GLubyte*) ctx->pszRealRenderer;
+                return ctx->pszRealRenderer;
             }
             else
@@ -155 +155 @@
         case GL_REAL_VENDOR:
             GetString(GL_REAL_VENDOR, ctx->pszRealVendor);
-            return (const GLubyte*) ctx->pszRealVendor;
+            return ctx->pszRealVendor;
         case GL_REAL_VERSION:
             GetString(GL_REAL_VERSION, ctx->pszRealVersion);
-            return (const GLubyte*) ctx->pszRealVersion;
+            return ctx->pszRealVersion;
         case GL_REAL_RENDERER:
             GetString(GL_REAL_RENDERER, ctx->pszRealRenderer);
-            return (const GLubyte*) ctx->pszRealRenderer;
+            return ctx->pszRealRenderer;
 #endif
         default: