diff options
| author | Scott Anderson <ascent12@hotmail.com> | 2017-06-08 00:52:33 +1200 |
|---|---|---|
| committer | Scott Anderson <ascent12@hotmail.com> | 2017-06-08 00:52:33 +1200 |
| commit | 382f712792007ad839c4b6febf7f6387128ca7af (patch) | |
| tree | 03a8e31a065c43f5c5cce46fd6e366b62d12a646 /include | |
| parent | 53dd622263cb2b952a148463cfb046ba084d57ac (diff) | |
| parent | 69deb99a654846d6c94ee7fc0f1da818c5965e3e (diff) | |
Merge remote-tracking branch 'upstream/master' into rotation
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/drm/drm.h | 1 | ||||
| -rw-r--r-- | include/wlr/types.h | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 004f3a10..2d063adb 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -34,7 +34,6 @@ struct wlr_output_state { struct wlr_output *wlr_output; enum wlr_drm_output_state state; uint32_t connector; - char name[16]; struct { uint32_t dpms; diff --git a/include/wlr/types.h b/include/wlr/types.h index 27819f56..a3afb258 100644 --- a/include/wlr/types.h +++ b/include/wlr/types.h @@ -22,11 +22,10 @@ struct wlr_output { struct wlr_output_state *state; uint32_t flags; - char *name; - char *make; - char *model; + char name[16]; + char make[48]; + char model[16]; uint32_t scale; - int32_t x, y; int32_t width, height; int32_t phys_width, phys_height; // mm int32_t subpixel; // enum wl_output_subpixel |