CVS commit: xsrc/external/mit/libXrandr/dist/src

[matthew green]

Module Name:    xsrc
Committed By:   mrg
Date:           Sat Jun  1 08:00:47 UTC 2013

Modified Files:
        xsrc/external/mit/libXrandr/dist/src: XrrProvider.c

Log Message:
merge libXrandr 1.4.1


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/libXrandr/dist/src/XrrProvider.c
diff -u xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.2 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.3
--- xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.2	Fri May 31 09:58:36 2013
+++ xsrc/external/mit/libXrandr/dist/src/XrrProvider.c	Sat Jun  1 08:00:47 2013
@@ -67,7 +67,7 @@ XRRGetProviderResources(Display *dpy, Wi
     xrpr = (XRRProviderResources *) Xmalloc(rbytes);
 
     if (xrpr == NULL) {
-       _XEatData (dpy, (unsigned long) nbytes);
+       _XEatDataWords (dpy, rep.length);
        UnlockDisplay (dpy);
        SyncHandle ();
        return NULL;
@@ -136,7 +136,7 @@ XRRGetProviderInfo(Display *dpy, XRRScre
 
     xpi = (XRRProviderInfo *)Xmalloc(rbytes);
     if (xpi == NULL) {
-	_XEatData (dpy, (unsigned long) nbytes);
+	_XEatDataWords (dpy, rep.length - (ProviderInfoExtra >> 2));
 	UnlockDisplay (dpy);
 	SyncHandle ();
 	return NULL;