gbm: don't return void

[mesa.git] / src / gbm / backends / dri / gbm_dri.c

diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index abbb0b90174d3eac2afccfd59dadf6456d70e163..99396f658f2f037420a9abd34c1a54bc0f9e690a 100644 (file)
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #include <dlfcn.h>
 #include <xf86drm.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
 
 #include <GL/gl.h> /* dri_interface needs GL types */
 #include <GL/internal/dri_interface.h>
@@ -56,14 +56,6 @@
 #include "wayland-drm.h"
 #endif
 
-#ifndef DRM_FORMAT_MOD_INVALID
-#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
-#endif
-
-#ifndef DRM_FORMAT_MOD_LINEAR
-#define DRM_FORMAT_MOD_LINEAR 0
-#endif
-
 static __DRIimage *
 dri_lookup_egl_image(__DRIscreen *screen, void *image, void *data)
 {
@@ -182,7 +174,7 @@ swrast_put_image(__DRIdrawable *driDrawable,
                  char          *data,
                  void          *loaderPrivate)
 {
-   return swrast_put_image2(driDrawable, op, x, y, width, height,
+   swrast_put_image2(driDrawable, op, x, y, width, height,
                             width * 4, data, loaderPrivate);
 }