Skip to content

Commit 229c7bc

Browse files
wezmbilelmoussaoui
authored andcommitted
quartz opt-in
1 parent 9b087c3 commit 229c7bc

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

cairo/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ freetype = ["cairo-sys-rs/freetype", "freetype-rs"]
2929
script = ["cairo-sys-rs/script"]
3030
xcb = ["cairo-sys-rs/xcb"]
3131
xlib = ["cairo-sys-rs/xlib"]
32+
quartz-surface = ["cairo-sys-rs/quartz-surface"]
3233
win32-surface = ["cairo-sys-rs/win32-surface"]
3334

3435
[dependencies.glib]

cairo/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,9 @@ mod ps;
282282
#[cfg(feature = "svg")]
283283
mod svg;
284284

285-
#[cfg(target_os = "macos")]
285+
#[cfg(all(target_os = "macos", feature = "quartz-surface"))]
286286
mod quartz_surface;
287-
#[cfg(target_os = "macos")]
287+
#[cfg(all(target_os = "macos", feature = "quartz-surface"))]
288288
pub use quartz_surface::QuartzSurface;
289289

290290
#[cfg(all(windows, feature = "win32-surface"))]

cairo/sys/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ freetype = []
4848
script = []
4949
xcb = []
5050
use_glib = ["glib-sys"]
51+
quartz-surface = []
5152
win32-surface = ["windows-sys"]
5253

5354
[dependencies]

cairo/sys/src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,22 +1496,22 @@ extern "C" {
14961496
#[cfg_attr(docsrs, doc(cfg(all(windows, feature = "win32-surface"))))]
14971497
pub fn cairo_win32_surface_get_image(surface: *mut cairo_surface_t) -> *mut cairo_surface_t;
14981498

1499-
#[cfg(target_os = "macos")]
1500-
#[cfg_attr(docsrs, doc(cfg(target_os = "macos")))]
1499+
#[cfg(all(target_os = "macos", feature = "quartz-surface"))]
1500+
#[cfg_attr(docsrs, doc(cfg(all(target_os = "macos", feature = "quartz-surface"))))]
15011501
pub fn cairo_quartz_surface_create(
15021502
format: cairo_format_t,
15031503
width: c_uint,
15041504
height: c_uint,
15051505
) -> *mut cairo_surface_t;
1506-
#[cfg(target_os = "macos")]
1507-
#[cfg_attr(docsrs, doc(cfg(target_os = "macos")))]
1506+
#[cfg(all(target_os = "macos", feature = "quartz-surface"))]
1507+
#[cfg_attr(docsrs, doc(cfg(all(target_os = "macos", feature = "quartz-surface"))))]
15081508
pub fn cairo_quartz_surface_create_for_cg_context(
15091509
cg_context: CGContextRef,
15101510
width: c_uint,
15111511
height: c_uint,
15121512
) -> *mut cairo_surface_t;
1513-
#[cfg(target_os = "macos")]
1514-
#[cfg_attr(docsrs, doc(cfg(target_os = "macos")))]
1513+
#[cfg(all(target_os = "macos", feature = "quartz-surface"))]
1514+
#[cfg_attr(docsrs, doc(cfg(all(target_os = "macos", feature = "quartz-surface"))))]
15151515
pub fn cairo_quartz_surface_get_cg_context(surface: *mut cairo_surface_t) -> CGContextRef;
15161516

15171517
// CAIRO SCRIPT

0 commit comments

Comments
 (0)