diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-12-13 18:38:25 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-12-13 18:38:25 -0500 |
| commit | c8feb73f5841e7812d8dfdb91f1064e2033d028c (patch) | |
| tree | 4f176f28ec27a4e5bfb9c671e569838741b6bfbd /render/picture.h | |
| parent | 9a7ce573636e349ee2967991c7cc1407e80ae524 (diff) | |
| parent | a125ce4a84f5fb5934fefebd7cfb22a83180874d (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
Diffstat (limited to 'render/picture.h')
| -rw-r--r-- | render/picture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/render/picture.h b/render/picture.h index e8a098cd9..045b29944 100644 --- a/render/picture.h +++ b/render/picture.h @@ -163,8 +163,8 @@ extern int PictureCmapPolicy; int PictureParseCmapPolicy (const char *name); -extern int RenderErrBase; -extern int RenderClientPrivateIndex; +extern int RenderErrBase; +extern DevPrivateKey RenderClientPrivateKey; /* Fixed point updates from Carl Worth, USC, Information Sciences Institute */ |