Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 61 insertions, 61 deletions

diff --git a/xorg-server/doc/c-extensions b/xorg-server/doc/c-extensions
index eb33e272b..984022333 100644
--- a/xorg-server/doc/c-extensions
+++ b/xorg-server/doc/c-extensions
@@ -1,61 +1,61 @@
-First of all: C89 or better.  If you don't have that, port gcc first.
-
-Use of C language extensions throughout the X server tree
----------------------------------------------------------
-
-Optional extensions:
-The server will still build if your toolchain does not support these
-extensions, although the results may not be optimal.
-
-    * _X_SENTINEL(x): member x of the passed structure must be NULL, e.g.:
-                      void parseOptions(Option *options _X_SENTINEL(0));
-                      parseOptions("foo", "bar", NULL); /* this is OK */
-                      parseOptions("foo", "bar", "baz"); /* this is not */
-                      This definition comes from Xfuncproto.h in the core
-                      protocol headers.
-    * _X_ATTRIBUTE_PRINTF(x, y): This function has printf-like semantics;
-                                 check the format string when built with
-                                 -Wformat (gcc) or similar.
-    * _X_EXPORT: this function should appear in symbol tables.
-    * _X_HIDDEN: this function should not appear in the _dynamic_ symbol
-                 table.
-    * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function
-                   is never called from another module.
-    * _X_INLINE: inline this functon if possible (generally obeyed unless
-                 disabling optimisations).
-    * _X_DEPRECATED: warn on use of this function.
-
-Mandatory extensions:
-The server will not build if your toolchain does not support these extensions.
-
-    * named initialisers: explicitly initialising structure members, e.g.:
-                          struct foo bar = { .baz = quux, .brian = "dog" };
-    * variadic macros: macros with a variable number of arguments, e.g.:
-                       #define DebugF(x, ...) /**/
-    * interleaved code and declarations: { foo = TRUE; int bar; do_stuff(); }
-
-
-Use of OS and library facilities throughout the X server tree
--------------------------------------------------------------
-
-Non-OS-dependent code can assume facilities at least as good as
-the non-OS-facility parts of POSIX-1.2001.  Ideally this would
-be C99, but even gcc+glibc doesn't implement that yet.
-
-Unix-like systems are assumed to be at least as good as UNIX03.
-
-Linux systems must be at least 2.4 or later.  As a practical matter
-though, 2.4 kernels never receive any testing.  Use 2.6 already.
-
-TODO: Solaris.
-
-TODO: *BSD.
-
-Code that needs to be portable to Windows should be careful to,
-well, be portable.  Note that there are two Windows ports, cygwin and
-mingw.  Cygwin is more or less like Linux, but mingw is a bit more
-restrictive.  TODO: document which versions of Windows we actually care
-about.
-
-OSX support is generally limited to the most recent version.  Currently
-that means 10.5.
+First of all: C89 or better.  If you don't have that, port gcc first.

+

+Use of C language extensions throughout the X server tree

+---------------------------------------------------------

+

+Optional extensions:

+The server will still build if your toolchain does not support these

+extensions, although the results may not be optimal.

+

+    * _X_SENTINEL(x): member x of the passed structure must be NULL, e.g.:

+                      void parseOptions(Option *options _X_SENTINEL(0));

+                      parseOptions("foo", "bar", NULL); /* this is OK */

+                      parseOptions("foo", "bar", "baz"); /* this is not */

+                      This definition comes from Xfuncproto.h in the core

+                      protocol headers.

+    * _X_ATTRIBUTE_PRINTF(x, y): This function has printf-like semantics;

+                                 check the format string when built with

+                                 -Wformat (gcc) or similar.

+    * _X_EXPORT: this function should appear in symbol tables.

+    * _X_HIDDEN: this function should not appear in the _dynamic_ symbol

+                 table.

+    * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function

+                   is never called from another module.

+    * _X_INLINE: inline this functon if possible (generally obeyed unless

+                 disabling optimisations).

+    * _X_DEPRECATED: warn on use of this function.

+

+Mandatory extensions:

+The server will not build if your toolchain does not support these extensions.

+

+    * named initialisers: explicitly initialising structure members, e.g.:

+                          struct foo bar = { .baz = quux, .brian = "dog" };

+    * variadic macros: macros with a variable number of arguments, e.g.:

+                       #define DebugF(x, ...) /**/

+    * interleaved code and declarations: { foo = TRUE; int bar; do_stuff(); }

+

+

+Use of OS and library facilities throughout the X server tree

+-------------------------------------------------------------

+

+Non-OS-dependent code can assume facilities at least as good as

+the non-OS-facility parts of POSIX-1.2001.  Ideally this would

+be C99, but even gcc+glibc doesn't implement that yet.

+

+Unix-like systems are assumed to be at least as good as UNIX03.

+

+Linux systems must be at least 2.4 or later.  As a practical matter

+though, 2.4 kernels never receive any testing.  Use 2.6 already.

+

+TODO: Solaris.

+

+TODO: *BSD.

+

+Code that needs to be portable to Windows should be careful to,

+well, be portable.  Note that there are two Windows ports, cygwin and

+mingw.  Cygwin is more or less like Linux, but mingw is a bit more

+restrictive.  TODO: document which versions of Windows we actually care

+about.

+

+OSX support is generally limited to the most recent version.  Currently

+that means 10.5.