diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-10-21 02:54:33 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-07 23:15:57 +0100 |
| commit | 5ec2366c40a540245be4a643fcf740fb16bcec50 (patch) | |
| tree | f3c82763aa3f6c19da425e75c5c37dae228f38b4 /nx-X11/programs/Xserver | |
| parent | 8ebb5d23c931810335739be16c1b10f44ed3c4d0 (diff) | |
| download | nx-libs-5ec2366c40a540245be4a643fcf740fb16bcec50.tar.gz nx-libs-5ec2366c40a540245be4a643fcf740fb16bcec50.tar.bz2 nx-libs-5ec2366c40a540245be4a643fcf740fb16bcec50.zip | |
Xext: lift xvmain.c to xorg-xserver-7.1/1.1 state
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/sync.c | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/xvmain.c | 6 |
2 files changed, 3 insertions, 4 deletions
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; |