pulling in changes from xorg-server-1.2-apple branch

This commit is contained in:
Ben Byer
2007-11-04 05:13:19 -08:00
parent 181468db92
commit ff9929ed48
7 changed files with 34 additions and 32 deletions

View File

@@ -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;