diff options
author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-09-29 17:05:12 +0100 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-09-29 12:15:11 -0700 |
commit | 72a9c686d7ecaa68d27687b316dbba92902809b4 (patch) | |
tree | d8d9c080057a62e05e0eec1e2e6d7dab77d9ef0b | |
parent | 1a9022d3289ff74043112808cc8aa315fd9c40e8 (diff) |
Cygwin/X: Fix compilation after "delete pervasively use of DISPATCH_PROC"
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.turney@dronecode.org.uk>
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
-rwxr-xr-x | 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 ca3dbc325..4027539c2 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; + } +} |