commit cbd4d5dbb70db62ba1cb79c7b904e6fa11f62d7e removes the static declarations of ProcWindowsWMDispatch and SProcWindowsWMDispatch which precede their first use in winWindowsWMExtensionInit()
Move winWindowsWMExtensionInit() to after the definition of those two functions to fix compilation. Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> --- Found by tinderbox http://tinderbox.freedesktop.org/builds/2010-09-28-0017/logs/xserver/#build hw/xwin/winwindowswm.c | 52 +++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 27 deletions(-) diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c index ca3dbc3..4027539 100755 --- a/hw/xwin/winwindowswm.c +++ b/hw/xwin/winwindowswm.c @@ -44,8 +44,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "protocol-versions.h" static int WMErrorBase; - - static unsigned char WMReqCode = 0; static int WMEventBase = 0; @@ -78,31 +76,6 @@ make_box (int x, int y, int w, int h) return r; } -void -winWindowsWMExtensionInit (void) -{ - ExtensionEntry* extEntry; - - ClientType = CreateNewResourceType(WMFreeClient, "WMClient"); - eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent"); - eventResource = FakeClientID(0); - - if (ClientType && eventResourceType && - (extEntry = AddExtension(WINDOWSWMNAME, - WindowsWMNumberEvents, - WindowsWMNumberErrors, - ProcWindowsWMDispatch, - SProcWindowsWMDispatch, - NULL, - StandardMinorOpcode))) - { - WMReqCode = (unsigned char)extEntry->base; - WMErrorBase = extEntry->errorBase; - WMEventBase = extEntry->eventBase; - EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent; - } -} - static int ProcWindowsWMQueryVersion(register ClientPtr client) { @@ -639,3 +612,28 @@ SProcWindowsWMDispatch (register ClientPtr client) return BadRequest; } } + +void +winWindowsWMExtensionInit (void) +{ + ExtensionEntry* extEntry; + + ClientType = CreateNewResourceType(WMFreeClient, "WMClient"); + eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent"); + eventResource = FakeClientID(0); + + if (ClientType && eventResourceType && + (extEntry = AddExtension(WINDOWSWMNAME, + WindowsWMNumberEvents, + WindowsWMNumberErrors, + ProcWindowsWMDispatch, + SProcWindowsWMDispatch, + NULL, + StandardMinorOpcode))) + { + WMReqCode = (unsigned char)extEntry->base; + WMErrorBase = extEntry->errorBase; + WMEventBase = extEntry->eventBase; + EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent; + } +} -- 1.7.2.3 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
