~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to src/platforms/mesa/include/mir_toolkit/mesa/native_display.h

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
#ifndef MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H
19
19
#define MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H
20
20
 
21
 
#include "mir_toolkit/mir_native_buffer.h"
22
 
#include "mir_toolkit/client_types.h"
 
21
#include <mir_toolkit/mir_native_buffer.h>
 
22
#include <mir_toolkit/client_types.h>
23
23
 
24
24
#define MIR_MESA_TRUE 1
25
25
#define MIR_MESA_FALSE 0