From a8c5c002fbaf9b0e81f6aa19b5c6b57c155865d1 Mon Sep 17 00:00:00 2001 From: Thomas Thurman Date: Mon, 2 Jun 2008 22:27:54 +0000 Subject: [PATCH] make sure compositor things don't get compiled when we're not using the 2008-06-02 Thomas Thurman * src/core/display.c: make sure compositor things don't get compiled when we're not using the compositor. svn path=/trunk/; revision=3748 --- ChangeLog | 5 +++++ src/core/display.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index a8a9a21cb..f9942fde8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-02 Thomas Thurman + + * src/core/display.c: make sure compositor things don't get + compiled when we're not using the compositor. + 2008-06-02 Thomas Thurman * test/metacity-test: new test script, imported from diff --git a/src/core/display.c b/src/core/display.c index 99c1aaeda..5b9d76b32 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -5116,6 +5116,7 @@ meta_display_remove_autoraise_callback (MetaDisplay *display) } } +#ifdef HAVE_COMPOSITE_EXTENSIONS void meta_display_get_compositor_version (MetaDisplay *display, int *major, @@ -5124,6 +5125,7 @@ meta_display_get_compositor_version (MetaDisplay *display, *major = display->composite_major_version; *minor = display->composite_minor_version; } +#endif Display * meta_display_get_xdisplay (MetaDisplay *display) @@ -5155,14 +5157,18 @@ meta_display_get_focus_window (MetaDisplay *display) return display->focus_window; } +#ifdef HAVE_COMPOSITE_EXTENSIONS int meta_display_get_damage_event_base (MetaDisplay *display) { return display->damage_event_base; } +#endif +#ifdef HAVE_COMPOSITE_EXTENSIONS int meta_display_get_shape_event_base (MetaDisplay *display) { return display->shape_event_base; } +#endif