Xext: lift xvmain.c to xorg-xserver-7.1/1.1 state

5ec2366c · Ulrich Sibiller · Mihai Moldovan · 8ebb5d23 · 5ec2366c · 5ec2366c
Commit 5ec2366c authored Oct 21, 2017 by Ulrich Sibiller Committed by Mihai Moldovan Feb 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

sync.c nx-X11/programs/Xserver/Xext/sync.c +0 -1

xvmain.c nx-X11/programs/Xserver/Xext/xvmain.c +3 -3

No files found.
--- 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;
 	}

--- 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;