diff options
| author | Keith Packard <keithp@keithp.com> | 2014-11-24 15:39:51 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-11-24 15:39:51 -0800 |
| commit | ec0ac8970b508adcbc3d104b14a127118e4979d0 (patch) | |
| tree | b1d39be7b2c83a1f85efd469105fb8a3c0fe8d6d /present | |
| parent | 65cc0982afb1d47d17e655efaef40d4a82e7574a (diff) | |
| parent | 0f88d4e7937116dbc438f98ddf1f3d94cfc5bead (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'present')
| -rw-r--r-- | present/present.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/present/present.c b/present/present.c index a9f221418..ac9047edb 100644 --- a/present/present.c +++ b/present/present.c @@ -91,7 +91,7 @@ present_flip_pending_pixmap(ScreenPtr screen) if (!screen_priv->flip_pending) return NULL; - + return screen_priv->flip_pending->pixmap; } @@ -372,7 +372,7 @@ present_set_tree_pixmap_visit(WindowPtr window, void *data) (*screen->SetWindowPixmap)(window, visit->new); return WT_WALKCHILDREN; } - + static void present_set_tree_pixmap(WindowPtr window, PixmapPtr pixmap) { |