diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-09-14 20:47:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 20:47:14 -0400 |
| commit | a088000983521923922ebc7ebfe51a272da6a041 (patch) | |
| tree | 434acb6312fd7650a29d5794400101aa17af2f79 /include | |
| parent | d549dc327e7670a54ed7f4e09f4abe062abf28a5 (diff) | |
| parent | b3cb22c003d15a2f9f638af4816b803beb836f14 (diff) | |
Merge pull request #1244 from emersion/xdg-output-suffix
xdg-output: add _v1 suffix
Diffstat (limited to 'include')
| -rw-r--r-- | include/wlr/types/meson.build | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_xdg_output_v1.h (renamed from include/wlr/types/wlr_xdg_output.h) | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/wlr/types/meson.build b/include/wlr/types/meson.build index 8c81cb0e..fd354795 100644 --- a/include/wlr/types/meson.build +++ b/include/wlr/types/meson.build @@ -35,7 +35,7 @@ install_headers( 'wlr_wl_shell.h', 'wlr_xcursor_manager.h', 'wlr_xdg_decoration_v1.h', - 'wlr_xdg_output.h', + 'wlr_xdg_output_v1.h', 'wlr_xdg_shell.h', 'wlr_xdg_shell_v6.h', subdir: 'wlr/types', diff --git a/include/wlr/types/wlr_xdg_output.h b/include/wlr/types/wlr_xdg_output_v1.h index 60611307..d4279fb9 100644 --- a/include/wlr/types/wlr_xdg_output.h +++ b/include/wlr/types/wlr_xdg_output_v1.h @@ -6,13 +6,13 @@ #error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features" #endif -#ifndef WLR_TYPES_WLR_XDG_OUTPUT_H -#define WLR_TYPES_WLR_XDG_OUTPUT_H +#ifndef WLR_TYPES_WLR_XDG_OUTPUT_V1_H +#define WLR_TYPES_WLR_XDG_OUTPUT_V1_H #include <wayland-server.h> #include <wlr/types/wlr_output_layout.h> -struct wlr_xdg_output { - struct wlr_xdg_output_manager *manager; +struct wlr_xdg_output_v1 { + struct wlr_xdg_output_manager_v1 *manager; struct wl_list resources; struct wl_list link; @@ -24,7 +24,7 @@ struct wlr_xdg_output { struct wl_listener destroy; }; -struct wlr_xdg_output_manager { +struct wlr_xdg_output_manager_v1 { struct wl_global *global; struct wl_list resources; struct wlr_output_layout *layout; @@ -40,8 +40,8 @@ struct wlr_xdg_output_manager { } events; }; -struct wlr_xdg_output_manager *wlr_xdg_output_manager_create( +struct wlr_xdg_output_manager_v1 *wlr_xdg_output_manager_v1_create( struct wl_display *display, struct wlr_output_layout *layout); -void wlr_xdg_output_manager_destroy(struct wlr_xdg_output_manager *manager); +void wlr_xdg_output_manager_v1_destroy(struct wlr_xdg_output_manager_v1 *manager); #endif |