Commit ce68336f authored by Bryce Harrington's avatar Bryce Harrington
Browse files

drm: Add/reorder headers as required by check-preprocessor-syntax.sh

If cairo-drm-intel-brw-eu.h and/or cairo-drm-intel-brw-structs.h are
intended to be private headers, then the change to include cairo.h can
be dropped but the headers should be renamed *-private.h to conform with
Cairo standards.

I'm not certain why check-preprocessor-syntax.sh started flagging these
issues, as it doesn't look like there's been changes to them recently.
But the release scripts won't move forward without these being fixed.
parent f613e071
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#ifndef CAIRO_DRM_INTEL_BRW_EU_H #ifndef CAIRO_DRM_INTEL_BRW_EU_H
#define CAIRO_DRM_INTEL_BRW_EU_H #define CAIRO_DRM_INTEL_BRW_EU_H
#include "cairo.h"
#include "cairo-drm-intel-brw-structs.h" #include "cairo-drm-intel-brw-structs.h"
#include "cairo-drm-intel-brw-defines.h" #include "cairo-drm-intel-brw-defines.h"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#ifndef CAIRO_DRM_INTEL_BRW_STRUCTS_H #ifndef CAIRO_DRM_INTEL_BRW_STRUCTS_H
#define CAIRO_DRM_INTEL_BRW_STRUCTS_H #define CAIRO_DRM_INTEL_BRW_STRUCTS_H
#include "cairo.h"
#include "cairo-types-private.h" #include "cairo-types-private.h"
/* Command packets: /* Command packets:
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
#ifndef CAIRO_DRM_INTEL_IOCTL_PRIVATE_H #ifndef CAIRO_DRM_INTEL_IOCTL_PRIVATE_H
#define CAIRO_DRM_INTEL_IOCTL_PRIVATE_H #define CAIRO_DRM_INTEL_IOCTL_PRIVATE_H
#include <drm/i915_drm.h>
#include "cairo-drm-intel-command-private.h" #include "cairo-drm-intel-command-private.h"
#include <drm/i915_drm.h>
struct drm_i915_gem_real_size { struct drm_i915_gem_real_size {
uint32_t handle; uint32_t handle;
uint64_t size; uint64_t size;
......
...@@ -27,10 +27,6 @@ ...@@ -27,10 +27,6 @@
* *
*/ */
#include <stddef.h>
#include <inttypes.h> /* workaround for broken <drm/radeon_drm.h> */
#include <drm/radeon_drm.h>
#include "cairoint.h" #include "cairoint.h"
#include "cairo-drm-private.h" #include "cairo-drm-private.h"
...@@ -40,6 +36,10 @@ ...@@ -40,6 +36,10 @@
#include "cairo-error-private.h" #include "cairo-error-private.h"
#include "cairo-image-surface-private.h" #include "cairo-image-surface-private.h"
#include <stddef.h>
#include <inttypes.h> /* workaround for broken <drm/radeon_drm.h> */
#include <drm/radeon_drm.h>
/* Basic stub surface for radeon chipsets */ /* Basic stub surface for radeon chipsets */
#define MAX_SIZE 2048 #define MAX_SIZE 2048
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment