Make sure feature macros are checked using #if, not #ifdef; add a test for it

This is more robust to cases where people want to assign 0 to those variables.
(win32/alternate build systems, etc)

1 files changed, 8 insertions, 0 deletions

diff --git a/src/cairo-win32.h b/src/cairo-win32.h
index 8bd7a9740..cb517bc87 100644
--- a/src/cairo-win32.h
+++ b/src/cairo-win32.h
@@ -68,6 +68,12 @@ cairo_win32_surface_get_dc (cairo_surface_t *surface);
 cairo_public cairo_surface_t *
 cairo_win32_surface_get_image (cairo_surface_t *surface);
 
+#if CAIRO_HAS_WIN32_FONT
+
+/*
+ * Win32 font support
+ */
+
 cairo_public cairo_font_face_t *
 cairo_win32_font_face_create_for_logfontw (LOGFONTW *logfont);
 
@@ -95,6 +101,8 @@ cairo_public void
 cairo_win32_scaled_font_get_device_to_logical (cairo_scaled_font_t *scaled_font,
 					       cairo_matrix_t *device_to_logical);
 
+#endif /* CAIRO_HAS_WIN32_FONT */
+
 CAIRO_END_DECLS
 
 #else  /* CAIRO_HAS_WIN32_SURFACE */