From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 12 Nov 2017 04:20:03 +0000 (-0600)
Subject: egl/haiku: Correct invalid void* conversion in calloc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f09e001a05cbd1b0cbda6b5a8ff5731b6d612c22;p=mesa.git

egl/haiku: Correct invalid void* conversion in calloc

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/src/egl/drivers/haiku/egl_haiku.cpp b/src/egl/drivers/haiku/egl_haiku.cpp
index 237cebf056e..287760661e5 100644
--- a/src/egl/drivers/haiku/egl_haiku.cpp
+++ b/src/egl/drivers/haiku/egl_haiku.cpp
@@ -313,7 +313,8 @@ _eglBuiltInDriver(void)
 {
 	CALLED();
 
-	_EGLDriver* driver = calloc(1, sizeof(*driver));
+	_EGLDriver* driver;
+	driver = (_EGLDriver*) calloc(1, sizeof(*driver));
 	if (!driver) {
 		_eglError(EGL_BAD_ALLOC, "_eglBuiltInDriverHaiku");
 		return NULL;