2 files changed, 3 insertions, 2 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,
 };