diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-14 09:42:43 +0100 |
| commit | 93795f7d8ca73dd428a926901cbc632015ac0cf5 (patch) | |
| tree | 3fdcae64c6a51d6512aa32387846a2f282439855 /libXinerama/src | |
| parent | 00ea126522f5bbf5c4600ddb93a45b260475c8c1 (diff) | |
| parent | 156e37d3879b316329e3e05579414031da2647e2 (diff) | |
| download | vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.gz vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.tar.bz2 vcxsrv-93795f7d8ca73dd428a926901cbc632015ac0cf5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/util/makekeys.c
Diffstat (limited to 'libXinerama/src')
| -rw-r--r-- | libXinerama/src/Xinerama.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libXinerama/src/Xinerama.c b/libXinerama/src/Xinerama.c index 93b1a9f21..7d7e4d856 100644 --- a/libXinerama/src/Xinerama.c +++ b/libXinerama/src/Xinerama.c @@ -34,7 +34,7 @@ Equipment Corporation. static XExtensionInfo _panoramiX_ext_info_data; static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data; -static /* const */ 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) |