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 /Xext/cup.c | |
| parent | 9a7ce573636e349ee2967991c7cc1407e80ae524 (diff) | |
| parent | a125ce4a84f5fb5934fefebd7cfb22a83180874d (diff) | |
| download | xserver-c8feb73f5841e7812d8dfdb91f1064e2033d028c.tar.gz | |
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 'Xext/cup.c')
| -rw-r--r-- | Xext/cup.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/Xext/cup.c b/Xext/cup.c index 44c96643d..d0e820c41 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -123,16 +123,13 @@ static xColorItem citems[] = { void XcupExtensionInit (INITARGS) { - ExtensionEntry* extEntry; - - if (!(extEntry = AddExtension (XCUPNAME, - 0, - XcupNumberErrors, - ProcDispatch, - SProcDispatch, - ResetProc, - StandardMinorOpcode))) - return; + (void) AddExtension (XCUPNAME, + 0, + XcupNumberErrors, + ProcDispatch, + SProcDispatch, + ResetProc, + StandardMinorOpcode); /* PC servers initialize the desktop colors (citems) here! */ } |