diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:37:59 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:37:59 +0000 |
| commit | e56e24af252bd3b8e58076adf0f8eabf1103f187 (patch) | |
| tree | 9d378148aa5cfb83675cfb070a6af296cb4b3e4f /hw/xfree86/dri | |
| parent | 2e1868b560315a8b20d688e646c489a5ad93eeae (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/GL.
Diffstat (limited to 'hw/xfree86/dri')
| -rw-r--r-- | hw/xfree86/dri/dri.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/dri/dri.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/dristruct.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/xf86dri.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 446259287..e01303f9f 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.38 2002/11/20 18:10:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.39 2003/11/10 18:21:41 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -1616,7 +1616,7 @@ DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) if(pDRIPriv->nrWindows > 0) { RegionRec reg; - REGION_INIT(pScreen, ®, NullBox, 0); + REGION_NULL(pScreen, ®); TraverseTree(pWin, DRITreeTraversal, (pointer)(®)); if(REGION_NOTEMPTY(pScreen, ®)) { diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 8a4462bb8..f556d261e 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.19 2002/10/30 12:52:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index 268a2a655..cf1b1eacf 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.13 2002/11/20 18:10:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.12 2002/10/30 12:52:03 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 1be253a42..201cdbac5 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -241,7 +241,7 @@ ProcXF86DRIAuthConnection( rep.authenticated = 1; if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic)) { - ErrorF("Failed to authenticate %u\n", stuff->magic); + ErrorF("Failed to authenticate %lu\n", (unsigned long)stuff->magic); rep.authenticated = 0; } WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep); |