Solved mesa compilation errors

3 files changed, 11 insertions, 10 deletions

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 7f84e6496..f69cfcb65 100755
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -114,6 +114,7 @@ dri2CreateNewScreen2(int scrn, int fd,
     static const __DRIextension *emptyExtensionList[] = { NULL };
     __DRIscreen *psp;
 	  int gl_version_override;
+	  int i;
 
     psp = calloc(1, sizeof(*psp));
     if (!psp)
@@ -126,7 +127,7 @@ dri2CreateNewScreen2(int scrn, int fd,
      * (megadrivers), use that instead.
      */
     if (driver_extensions) {
-       for (int i = 0; driver_extensions[i]; i++) {
+       for (i = 0; driver_extensions[i]; i++) {
           if (strcmp(driver_extensions[i]->name, __DRI_DRIVER_VTABLE) == 0) {
              psp->driver =
                 ((__DRIDriverVtableExtension *)driver_extensions[i])->vtable;
diff --git a/mesalib/src/mesa/drivers/dri/common/megadriver_stub.c b/mesalib/src/mesa/drivers/dri/common/megadriver_stub.c
index 6bf5d7327..3a33d74ab 100644
--- a/mesalib/src/mesa/drivers/dri/common/megadriver_stub.c
+++ b/mesalib/src/mesa/drivers/dri/common/megadriver_stub.c
@@ -37,5 +37,5 @@ __DRIconfig **stub_error_init_screen(__DRIscreen *psp)
  * never be used.
  */
 const struct __DriverAPIRec driDriverAPI = {
-   .InitScreen = stub_error_init_screen,
+   /*.InitScreen = */stub_error_init_screen,
 };
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index fa7d695ab..6e76b1493 100755
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -64,7 +64,7 @@
 #include "swrast_priv.h"
 #include "swrast/s_context.h"
 
-const __DRIextension **__driDriverGetExtensions_swrast(void);
+PUBLIC const __DRIextension **__driDriverGetExtensions_swrast(void);
 
 /**
  * Screen and config-related functions
@@ -83,7 +83,7 @@ static void swrastSetTexBuffer2(__DRIcontext *pDRICtx, GLint target,
     uint32_t internalFormat;
     gl_format texFormat;
 
-    dri_ctx = pDRICtx->driverPrivate;
+    dri_ctx = (struct dri_context *)pDRICtx->driverPrivate;
 
     internalFormat = (texture_format == __DRI_TEXTURE_FORMAT_RGB ? 3 : 4);
 
@@ -315,7 +315,7 @@ swrast_alloc_back_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
 
     swrast_alloc_front_storage(ctx, rb, internalFormat, width, height);
 
-    xrb->Base.Buffer = malloc(height * xrb->pitch);
+    xrb->Base.Buffer = (GLubyte*)malloc(height * xrb->pitch);
 
     return GL_TRUE;
 }
@@ -324,7 +324,7 @@ static struct dri_swrast_renderbuffer *
 swrast_new_renderbuffer(const struct gl_config *visual, __DRIdrawable *dPriv,
 			GLboolean front)
 {
-    struct dri_swrast_renderbuffer *xrb = calloc(1, sizeof *xrb);
+    struct dri_swrast_renderbuffer *xrb = (struct dri_swrast_renderbuffer *)calloc(1, sizeof *xrb);
     struct gl_renderbuffer *rb;
     GLuint pixel_format;
 
@@ -405,7 +405,7 @@ swrast_map_renderbuffer(struct gl_context *ctx,
       xrb->map_h = h;
 
       stride = w * cpp;
-      xrb->Base.Buffer = malloc(h * stride);
+      xrb->Base.Buffer = (GLubyte*)malloc(h * stride);
 
       sPriv->swrast_loader->getImage(dPriv, x, y, w, h,
 				     (char *) xrb->Base.Buffer,
@@ -474,7 +474,7 @@ dri_create_buffer(__DRIscreen * sPriv,
     dPriv->driverPrivate = drawable;
     drawable->dPriv = dPriv;
 
-    drawable->row = malloc(SWRAST_MAX_WIDTH * 4);
+    drawable->row = (char*)malloc(SWRAST_MAX_WIDTH * 4);
     if (drawable->row == NULL)
 	goto drawable_fail;
 
@@ -838,8 +838,8 @@ static const struct __DriverAPIRec swrast_driver_api = {
 };
 
 static const struct __DRIDriverVtableExtensionRec swrast_vtable = {
-   .base = { __DRI_DRIVER_VTABLE, 1 },
-   .vtable = &swrast_driver_api,
+   /*.base = */{ __DRI_DRIVER_VTABLE, 1 },
+   /*.vtable = */&swrast_driver_api,
 };
 
 static const __DRIextension *swrast_driver_extensions[] = {