xserver: Branch 'master'

[Dodji Seketeli]

 hw/kdrive/ephyr/ephyr.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d74b0327e8355546e6b41e8ce684f461d65fa9dc
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Wed Feb 27 09:48:10 2008 +0100

    [Xephyr/GL] unbreak the build
    
    Don't touch Xephyr DRI stuff when not compiling in a DRI environment.

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 738704e..e95001d 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -841,6 +841,7 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs =
   ephyrWarpCursor
 };
 
+#ifdef XEPHYR_DRI
 /**
  * find if the remote window denoted by a_remote
  * is paired with an internal Window within the Xephyr server.
@@ -872,6 +873,7 @@ ephyrExposePairedWindow (int a_remote)
     screen->WindowExposures (pair->local, &reg, NullRegion);
     REGION_UNINIT (screen, &reg);
 }
+#endif /*XEPHYR_DRI*/
 
 void
 ephyrPoll(void)
@@ -948,6 +950,7 @@ ephyrPoll(void)
 	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);
 	  break;
 
+#ifdef XEPHYR_DRI
 	case EPHYR_EV_EXPOSE:
 	  /*
 	   * We only receive expose events when the expose event have
@@ -957,6 +960,7 @@ ephyrPoll(void)
 	   */
 	  ephyrExposePairedWindow (ev.data.expose.window);
 	  break;
+#endif /*XEPHYR_DRI*/
 
 	default:
 	  break;