From 5ec2366c40a540245be4a643fcf740fb16bcec50 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 21 Oct 2017 02:54:33 +0200 Subject: Xext: lift xvmain.c to xorg-xserver-7.1/1.1 state --- nx-X11/programs/Xserver/Xext/sync.c | 1 - nx-X11/programs/Xserver/Xext/xvmain.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver') diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 48b142f82..e90e35db9 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -316,7 +316,6 @@ SyncDeleteTriggerFromCounter(pTrigger) else pTrigger->pCounter->pTriglist = pCur->next; - xfree(pCur); free(pCur); break; } diff --git a/nx-X11/programs/Xserver/Xext/xvmain.c b/nx-X11/programs/Xserver/Xext/xvmain.c index 397f8dc81..c1492fdc6 100644 --- a/nx-X11/programs/Xserver/Xext/xvmain.c +++ b/nx-X11/programs/Xserver/Xext/xvmain.c @@ -253,7 +253,7 @@ CreateResourceTypes() } -int +_X_EXPORT int XvScreenInit(ScreenPtr pScreen) { XvScreenPtr pxvs; @@ -333,13 +333,13 @@ XvResetProc(ExtensionEntry* extEntry) { } -int +_X_EXPORT int XvGetScreenIndex() { return XvScreenIndex; } -unsigned long +_X_EXPORT unsigned long XvGetRTPort() { return XvRTPort; -- cgit v1.2.3