aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-26 12:48:28 +0200
committermarha <marha@users.sourceforge.net>2011-07-26 12:48:28 +0200
commitdc23661fa1d58aa98d67fae47a919de452b8cd28 (patch)
tree0a8c7987f3756290e3ba9cfb8cdf23d6e9532037 /libX11
parent8680f93ff96770b0a022596d8d4092a29c586435 (diff)
parentece07bdeaa82ea59e74bcfc588bcabe5e47567c1 (diff)
downloadvcxsrv-dc23661fa1d58aa98d67fae47a919de452b8cd28.tar.gz
vcxsrv-dc23661fa1d58aa98d67fae47a919de452b8cd28.tar.bz2
vcxsrv-dc23661fa1d58aa98d67fae47a919de452b8cd28.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libX11/specs/libX11/CH11.xml mesalib/src/glsl/main.cpp mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/get.c mesalib/src/mesa/main/texcompress.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.h xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/man/Xquartz.man xorg-server/hw/xquartz/xpr/dri.c xorg-server/xkeyboard-config/symbols/ee
Diffstat (limited to 'libX11')
-rw-r--r--libX11/specs/libX11/CH11.xml34
1 files changed, 17 insertions, 17 deletions
diff --git a/libX11/specs/libX11/CH11.xml b/libX11/specs/libX11/CH11.xml
index fbac7d5ab..99f56ff31 100644
--- a/libX11/specs/libX11/CH11.xml
+++ b/libX11/specs/libX11/CH11.xml
@@ -2061,7 +2061,7 @@ chapter:
</thead>
<tbody>
<row>
- <entry><errorname>BadAccess</errorname></entry>
+ <entry><errorname id='BadAccess'>BadAccess</errorname></entry>
<entry>A client attempts to grab a key/button combination already grabbed
by another client.</entry>
</row>
@@ -2085,7 +2085,7 @@ chapter:
has already selected.</entry>
</row>
<row>
- <entry><errorname>BadAlloc</errorname></entry>
+ <entry><errorname id='BadAlloc'>BadAlloc</errorname></entry>
<entry>The server fails to allocate the requested resource.
Note that the explicit listing of
<errorname>BadAlloc</errorname>
@@ -2100,42 +2100,42 @@ chapter:
them.</entry>
</row>
<row>
- <entry><errorname>BadAtom</errorname></entry>
+ <entry><errorname id='BadAtom'>BadAtom</errorname></entry>
<entry>A value for an atom argument does not name a defined atom.</entry>
</row>
<row>
- <entry><errorname>BadColor</errorname></entry>
+ <entry><errorname id='BadColor'>BadColor</errorname></entry>
<entry>A value for a colormap argument does not name a defined colormap.</entry>
</row>
<row>
- <entry><errorname>BadCursor</errorname></entry>
+ <entry><errorname id='BadCursor'>BadCursor</errorname></entry>
<entry>A value for a cursor argument does not name a defined cursor.</entry>
</row>
<row>
- <entry><errorname>BadDrawable</errorname></entry>
+ <entry><errorname id='BadDrawable'>BadDrawable</errorname></entry>
<entry>A value for a drawable argument does not name a defined window or pixmap.</entry>
</row>
<row>
- <entry><errorname>BadFont</errorname></entry>
+ <entry><errorname id='BadFont'>BadFont</errorname></entry>
<entry>A value for a font argument does not name a defined font (or, in some cases,
<type>GContext</type>).</entry>
</row>
<row>
- <entry><errorname>BadGC</errorname></entry>
+ <entry><errorname id='BadGC'>BadGC</errorname></entry>
<entry>A value for a
<type>GContext</type>
argument does not name a defined
<type>GContext</type>.</entry>
</row>
<row>
- <entry><errorname>BadIDChoice</errorname></entry>
+ <entry><errorname id='BadIDChoice'>BadIDChoice</errorname></entry>
<entry>The value chosen for a resource identifier either is not included in the
range assigned to the client or is already in use.
Under normal circumstances,
this cannot occur and should be considered a server or Xlib error.</entry>
</row>
<row>
- <entry><errorname>BadImplementation</errorname></entry>
+ <entry><errorname id='BadImplementation'>BadImplementation</errorname></entry>
<entry>The server does not implement some aspect of the request.
A server that generates this error for a core request is deficient.
As such, this error is not listed for any of the requests,
@@ -2143,7 +2143,7 @@ chapter:
and handle or discard them.</entry>
</row>
<row>
- <entry><errorname>BadLength</errorname></entry>
+ <entry><errorname id='BadLength'>BadLength</errorname></entry>
<entry>The length of a request is shorter or longer than that required to
contain the arguments.
This is an internal Xlib or server error.</entry>
@@ -2154,7 +2154,7 @@ chapter:
The length of a request exceeds the maximum length accepted by the server.</entry>
</row>
<row>
- <entry><errorname>BadMatch</errorname></entry>
+ <entry><errorname id='BadMatch'>BadMatch</errorname></entry>
<entry>In a graphics request,
the root and depth of the graphics context do not match those of the drawable.</entry>
</row>
@@ -2174,20 +2174,20 @@ chapter:
window lacks this attribute.</entry>
</row>
<row>
- <entry><errorname>BadName</errorname></entry>
+ <entry><errorname id='BadName'>BadName</errorname></entry>
<entry>A font or color of the specified name does not exist.</entry>
</row>
<row>
- <entry><errorname>BadPixmap</errorname></entry>
+ <entry><errorname id='BadPixmap'>BadPixmap</errorname></entry>
<entry>A value for a pixmap argument does not name a defined pixmap.</entry>
</row>
<row>
- <entry><errorname>BadRequest</errorname></entry>
+ <entry><errorname id='BadRequest'>BadRequest</errorname></entry>
<entry>The major or minor opcode does not specify a valid request.
This usually is an Xlib or server error.</entry>
</row>
<row>
- <entry><errorname>BadValue</errorname></entry>
+ <entry><errorname id='BadValue'>BadValue</errorname></entry>
<entry>Some numeric value falls outside of the range of values accepted
by the request.
Unless a specific range is specified for an argument,
@@ -2196,7 +2196,7 @@ chapter:
this error (due to the encoding).</entry>
</row>
<row>
- <entry><errorname>BadWindow</errorname></entry>
+ <entry><errorname id='BadWindow'>BadWindow</errorname></entry>
<entry>A value for a window argument does not name a defined window.</entry>
</row>
</tbody>