Module Name: xsrc
Committed By: christos
Date: Thu Mar 17 02:48:09 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-intel-old/dist/src: i830.h i965_render.c
Log Message:
fix const issues (Q+D)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h \
xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h
diff -u xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h:1.1.1.1 xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h:1.2
--- xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h:1.1.1.1 Mon May 18 18:11:09 2015
+++ xsrc/external/mit/xf86-video-intel-old/dist/src/i830.h Wed Mar 16 22:48:09 2016
@@ -900,7 +900,7 @@ intel_emit_reloc(drm_intel_bo *bo, uint3
}
static inline drm_intel_bo *
-intel_bo_alloc_for_data(ScrnInfoPtr scrn, void *data, unsigned int size,
+intel_bo_alloc_for_data(ScrnInfoPtr scrn, const void *data, unsigned int size,
char *name)
{
I830Ptr pI830 = I830PTR(scrn);
Index: xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c
diff -u xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c:1.1.1.1 xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c:1.2
--- xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c:1.1.1.1 Mon May 18 18:11:11 2015
+++ xsrc/external/mit/xf86-video-intel-old/dist/src/i965_render.c Wed Mar 16 22:48:09 2016
@@ -513,7 +513,7 @@ typedef enum {
} wm_kernel_t;
#define KERNEL(kernel_enum, kernel, masked) \
- [kernel_enum] = {&kernel, sizeof(kernel), masked}
+ [kernel_enum] = {__UNCONST(&kernel), sizeof(kernel), masked}
struct wm_kernel_info {
void *data;
unsigned int size;
