diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2005-01-06 04:14:03 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2005-01-06 04:14:03 +0000 |
| commit | a40112588f7aef30c78de2c1aa02b7e1f4ffaef8 (patch) | |
| tree | c43b85a0b9f0f4e3f14f9f3d5b92eb6e21bf6c17 /dix | |
| parent | b17cfa150080f315e1b40c9926e4e30c4fdfd02c (diff) | |
Integrate updates from Xorg 6.8.2 RC2.lg3d-dev-0-6-1
VS: ----------------------------------------------------------------------
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/dispatch.c | 4 | ||||
| -rw-r--r-- | dix/main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index d9d26538d..4c693718f 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.5.6.2 2004/12/11 01:50:40 deronj Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.5.6.3 2004/12/23 23:50:21 deronj Exp $ */ /* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */ /************************************************************ @@ -494,7 +494,7 @@ Dispatch(void) register int nready; register HWEventQueuePtr* icheck = checkForInput; #ifdef SMART_SCHEDULE - int start_tick; + long start_tick; #endif nextFreeClientID = 1; diff --git a/dix/main.c b/dix/main.c index 2a930d9dc..33c18bbe7 100644 --- a/dix/main.c +++ b/dix/main.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.2 2004/04/23 19:04:44 eich Exp $ */ +/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.3.4.1 2004/12/08 06:02:34 gisburn Exp $ */ /* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */ /*********************************************************** @@ -689,7 +689,7 @@ AddScreen( if (i == MAXSCREENS) return -1; - pScreen = (ScreenPtr) xalloc(sizeof(ScreenRec)); + pScreen = (ScreenPtr) xcalloc(1, sizeof(ScreenRec)); if (!pScreen) return -1; |