diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-05 19:08:36 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-05 19:08:36 -0500 |
| commit | a52c9b2a59f27266557ff9d5d2c08492e04135a6 (patch) | |
| tree | 705f11c54e8a31a07dde9ab6835032e2849e132b /hw/darwin/quartz/xpr/xprFrame.c | |
| parent | c7e18beb3c87eb1ada9b21c4ffacd11c1939c087 (diff) | |
| parent | 58332894c061ae96d6a457f65266660f5f65e88b (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
Diffstat (limited to 'hw/darwin/quartz/xpr/xprFrame.c')
| -rw-r--r-- | hw/darwin/quartz/xpr/xprFrame.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index c5b84f08b..0d12bf9ef 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/darwin/quartz/xpr/xprFrame.c @@ -1,7 +1,6 @@ /* * Xplugin rootless implementation frame functions - */ -/* + * * Copyright (c) 2002 Apple Computer, Inc. All rights reserved. * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved. * @@ -411,7 +410,7 @@ xprInit(ScreenPtr pScreen) * Given the id of a physical window, try to find the top-level (or root) * X window that it represents. */ -static WindowPtr +WindowPtr xprGetXWindow(xp_window_id wid) { RootlessWindowRec *winRec; |