[X2Go-Commits] [nx-libs] 07/09: Xext: lift xvmain.c to xorg-xserver-7.1/1.1 state

git-admin at x2go.org git-admin at x2go.org
Thu Feb 8 21:49:15 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 5ec2366c40a540245be4a643fcf740fb16bcec50
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Sat Oct 21 02:54:33 2017 +0200

    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(-)

diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index 48b142f..e90e35d 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 397f8dc..c1492fd 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;

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list