Module Name:    xsrc
Committed By:   mrg
Date:           Mon Jun  3 04:37:59 UTC 2013

Modified Files:
        xsrc/external/mit/libXScrnSaver/dist/src: XScrnSaver.c
        xsrc/external/mit/libXinerama/dist/src: Xinerama.c
        xsrc/external/mit/libXres/dist/src: XRes.c
        xsrc/external/mit/libXtst/dist/src: XRecord.c XTest.c
        xsrc/external/mit/libXxf86vm/dist/src: XF86VMode.c

Log Message:
revert 'const' removal changes, now that libXext is also updated.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXinerama/dist/src/Xinerama.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXres/dist/src/XRes.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXtst/dist/src/XRecord.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXtst/dist/src/XTest.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.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/libXScrnSaver/dist/src/XScrnSaver.c
diff -u xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.2 xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.3
--- xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c:1.2	Fri May 31 00:50:10 2013
+++ xsrc/external/mit/libXScrnSaver/dist/src/XScrnSaver.c	Mon Jun  3 04:37:59 2013
@@ -36,7 +36,7 @@ in this Software without prior written a
 
 static XExtensionInfo _screen_saver_info_data;
 static XExtensionInfo *screen_saver_info = &_screen_saver_info_data;
-static char *screen_saver_extension_name = ScreenSaverName;
+static const char *screen_saver_extension_name = ScreenSaverName;
 
 #define ScreenSaverCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, screen_saver_extension_name, val)

Index: xsrc/external/mit/libXinerama/dist/src/Xinerama.c
diff -u xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.2 xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.3
--- xsrc/external/mit/libXinerama/dist/src/Xinerama.c:1.2	Fri May 31 09:33:32 2013
+++ xsrc/external/mit/libXinerama/dist/src/Xinerama.c	Mon Jun  3 04:37:59 2013
@@ -34,7 +34,7 @@ Equipment Corporation.
 
 static XExtensionInfo _panoramiX_ext_info_data;
 static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data;
-static char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
+static const char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME;
 
 #define PanoramiXCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, panoramiX_extension_name, val)

Index: xsrc/external/mit/libXres/dist/src/XRes.c
diff -u xsrc/external/mit/libXres/dist/src/XRes.c:1.2 xsrc/external/mit/libXres/dist/src/XRes.c:1.3
--- xsrc/external/mit/libXres/dist/src/XRes.c:1.2	Fri May 31 09:33:32 2013
+++ xsrc/external/mit/libXres/dist/src/XRes.c	Mon Jun  3 04:37:59 2013
@@ -27,7 +27,7 @@ static inline void _XEatDataWords(Displa
 
 static XExtensionInfo _xres_ext_info_data;
 static XExtensionInfo *xres_ext_info = &_xres_ext_info_data;
-static char *xres_extension_name = XRES_NAME;
+static const char *xres_extension_name = XRES_NAME;
 
 #define XResCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, xres_extension_name, val)

Index: xsrc/external/mit/libXtst/dist/src/XRecord.c
diff -u xsrc/external/mit/libXtst/dist/src/XRecord.c:1.3 xsrc/external/mit/libXtst/dist/src/XRecord.c:1.4
--- xsrc/external/mit/libXtst/dist/src/XRecord.c:1.3	Fri May 31 09:21:06 2013
+++ xsrc/external/mit/libXtst/dist/src/XRecord.c	Mon Jun  3 04:37:59 2013
@@ -74,7 +74,7 @@ static inline void _XEatDataWords(Displa
 
 static XExtensionInfo _xrecord_info_data;
 static XExtensionInfo *xrecord_info = &_xrecord_info_data;
-static char *xrecord_extension_name = RECORD_NAME;
+static const char *xrecord_extension_name = RECORD_NAME;
 
 #define XRecordCheckExtension(dpy,i,val) \
     XextCheckExtension(dpy, i, xrecord_extension_name, val)

Index: xsrc/external/mit/libXtst/dist/src/XTest.c
diff -u xsrc/external/mit/libXtst/dist/src/XTest.c:1.2 xsrc/external/mit/libXtst/dist/src/XTest.c:1.3
--- xsrc/external/mit/libXtst/dist/src/XTest.c:1.2	Fri May 31 01:37:29 2013
+++ xsrc/external/mit/libXtst/dist/src/XTest.c	Mon Jun  3 04:37:59 2013
@@ -40,7 +40,7 @@ from The Open Group.
 
 static XExtensionInfo _xtest_info_data;
 static XExtensionInfo *xtest_info = &_xtest_info_data;
-static char *xtest_extension_name = XTestExtensionName;
+static const char *xtest_extension_name = XTestExtensionName;
 
 #define XTestCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, xtest_extension_name, val)

Index: xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c
diff -u xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.2 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.3
--- xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.2	Fri May 31 09:33:32 2013
+++ xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c	Mon Jun  3 04:37:59 2013
@@ -62,7 +62,7 @@ static inline void _XEatDataWords(Displa
 
 static XExtensionInfo _xf86vidmode_info_data;
 static XExtensionInfo *xf86vidmode_info = &_xf86vidmode_info_data;
-static char *xf86vidmode_extension_name = XF86VIDMODENAME;
+static const char *xf86vidmode_extension_name = XF86VIDMODENAME;
 
 #define XF86VidModeCheckExtension(dpy,i,val) \
   XextCheckExtension (dpy, i, xf86vidmode_extension_name, val)

Reply via email to