diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-05-18 19:24:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-05-18 19:24:12 +0000 |
| commit | e3927c0603c5449094cda0a6ecb83f1d347ce18c (patch) | |
| tree | ec6858dcf5ed0e7eb94bf700fe062365143c49a0 /proto/x11proto | |
| parent | 3133a25f03e99afbc2ef1792989fb75f739456e9 (diff) | |
Update to xproto 7.0.17. Tested on a bulk ports build by naddy@.
Diffstat (limited to 'proto/x11proto')
31 files changed, 1379 insertions, 1191 deletions
diff --git a/proto/x11proto/COPYING b/proto/x11proto/COPYING index 1724bb299..e514d3609 100644 --- a/proto/x11proto/COPYING +++ b/proto/x11proto/COPYING @@ -1,3 +1,24 @@ +Copyright © 1991 Sun Microsystems, Inc. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + Copyright 1987, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its diff --git a/proto/x11proto/ChangeLog b/proto/x11proto/ChangeLog index d01908c4c..c2e3246ca 100644 --- a/proto/x11proto/ChangeLog +++ b/proto/x11proto/ChangeLog @@ -1,18 +1,300 @@ +commit 9ffca704438993516016671e9a7f67c5ca21f142 +Author: Julien Cristau <jcristau@debian.org> +Date: Sat May 15 17:43:32 2010 +0200 + + xproto 7.0.17 + + Signed-off-by: Julien Cristau <jcristau@debian.org> + +commit 81c3cc1ce1f163de91d33bfa1b335f8b4d309c13 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Mar 28 19:25:52 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 1f442cdd1c26fa10e654ef2e957e24c2306abb11 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Mar 28 19:00:31 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 1511eb6065c103149b7ce59b4cc0aa538449cf80 +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Sat Mar 27 19:42:59 2010 -0700 + + Add _X_NORETURN macro to signify functions that don't return + + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit e7d73aec46f2ebc21e8b80378c3647b69f098b9a +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sat Mar 27 16:38:27 2010 -0400 + + config: remove execute permission on configuration file + + Introduced in commit c879dab58f82f4789f27933c22706c84015f8684 + "avoid checking for fds_bits on mingw" + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit bf25d06799da98c3df655d8a734fe98c98bf143e +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jan 15 13:31:40 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit d02f4b124489016f43478ac2ca2fbb2d0253ba02 +Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> +Date: Tue Oct 13 16:51:14 2009 -0500 + + xproto: Cygwin GCC does not support visibility attributes + + Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> + Acked-by: Peter Hutterer <peter.hutterer@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit ec13f2cc5af936aafc3a483f441c44aa5ed14fe3 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Nov 22 19:24:48 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 45135e80f1e1f8818159f7d80372a77df0537738 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Mon Nov 16 11:13:30 2009 -0500 + + README: file created or updated #24206 + + Contains a set of URLs to freedesktop.org. + +commit cdd22487f12f7058404759bd138ada421debc93a +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Nov 15 19:45:27 2009 -0500 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit b99b992915dd19914c9464d9a96278d2cc2ceeeb +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Nov 15 18:31:29 2009 -0500 + + Makefile.am: INSTALL file is missing or incorrect #24206 + + The standard GNU file on building/installing tarball is copied + using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS + Add INSTALL target + +commit caea0fd5a966a74465d965ecab89f4829dced157 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Nov 15 18:11:36 2009 -0500 + + configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit f1b1d45cd955f24a338af098ebd6a181b1454b38 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sat Nov 14 20:47:09 2009 -0500 + + configure.ac: AM_MAINTAINER_MODE missing #24238 + + This turns off maintainer mode build rules in tarballs. + Works in conjunction with autogen.sh --enable-maintainer-mode + +commit 78947b5a7e0ef934fdce7e1bce734d2cf29639b4 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sat Nov 14 18:26:47 2009 -0500 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 3ec82cd722407e4dccd6165786d3452f3ab80bea +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Fri Oct 2 10:46:06 2009 +1000 + + Add XF86XK_TouchpadToggle + + Many laptops provide a key to enable or disable the touchpad and the + trackstick. On Lenovo T61s, this key is located on Fn + F8. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 4253e208088d166a8666f673360ef69a3c86f8b0 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Sep 23 17:04:09 2009 -0700 + + xproto 7.0.16 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 05914c82696432126a72845dd061c7f5e24963c5 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Wed Sep 23 17:00:18 2009 -0700 + + Don't need an #ifdef when both cases just include the same file + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit ef37625372546efb32cdb37823b9927cf16b0840 +Author: Jon TURNEY <jon.turney@dronecode.org.uk> +Date: Wed Jun 17 15:28:54 2009 +0100 + + Restore macro definition of sleep(), needed by Xming + + Removed in error by commit 1defe6b37c23941fe2a67ad4fa66e8ab5f37f9b3 + + Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> + +commit e9df99b12ef9fefdbc1c05ff51bddffe723051e9 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sun Jun 14 09:54:58 2009 -0700 + + Drop #ifdef USG checks for some truly ancient (pre-SVR4) SysV's + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 385c1343f7e0782b89e40fa17e378bc1f75ce62e +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sun Jun 14 09:43:53 2009 -0700 + + Get rid of unneeded && clause in list of LP64 ifdefs in Xmd.h + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 5aaec3c7a583354a07ec765327fd0edd6216981f +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sun Jun 14 09:33:16 2009 -0700 + + Drop support for SunOS 4 and Solaris releases older than 2.5 (1995) + + Includes changing remaining sun ifdef's to check for standard-conformant / + non-namespace-polluting #ifdef __sun instead of older #ifdef sun. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 5bad478221c54c0dbf682ef2569f6ca5ac050049 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sun Jun 14 09:10:06 2009 -0700 + + Use indentation to provide a map through the twisty maze of ifdefs, all alike + + git diff -w shows no changes other than whitespace in this patch + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 1f59b5f8eac522bb0a5155393224496c39deca42 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Sun Jun 14 08:31:13 2009 -0700 + + Removing dangling #else block from X_NOT_STDC_ENV removal + + Fixes mass damage caused by ced38e880b54f2aae31a5354aecb4235a129f0a4 + moving the includes for unistd.h, fcntl.h, etc. from the else for + X_NOT_STDC_ENV into the #else for #ifndef _XOS_H_, which made them + go away for everyone. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + +commit 4435ea3d806f5b9cd66b563a6b751ac5020404e3 +Author: Adam Jackson <ajax@redhat.com> +Date: Fri Jun 12 12:41:57 2009 -0400 + + Use ## catenation not /**/ + +commit 74d18e89a3a315ae9ee4fb3efcaf515abd339b1d +Author: Adam Jackson <ajax@redhat.com> +Date: Fri Jun 12 12:39:06 2009 -0400 + + __STDC__ is always defined in C89. + +commit bab9c572cd4dc916ff0acab99de8bb526212d77f +Author: Adam Jackson <ajax@redhat.com> +Date: Fri Jun 12 12:33:22 2009 -0400 + + Remove a bunch of garbage for unsupported platforms. + +commit ced38e880b54f2aae31a5354aecb4235a129f0a4 +Author: Adam Jackson <ajax@redhat.com> +Date: Fri Jun 12 11:55:37 2009 -0400 + + Remove all trace of X_NOT_STDC_ENV (#6527) + + Seriously C89 already you guys. + +commit 3fc87608d4b3f85d0dbd44ee9040d5ab60130bea +Author: Adam Jackson <ajax@redhat.com> +Date: Fri Jun 12 11:43:45 2009 -0400 + + Death to RCS tags. + +commit a2a0f01d367050ca182927b8219deb581a497c2c +Author: Jeremy Huddleston <jeremyhu@freedesktop.org> +Date: Tue Jun 9 00:47:25 2009 -0700 + + Apple: Only define _DARWIN_C_SOURCE if it isn't already defined + +commit 1defe6b37c23941fe2a67ad4fa66e8ab5f37f9b3 +Author: Jon TURNEY <jon.turney@dronecode.org.uk> +Date: Fri Jun 5 18:04:58 2009 +0100 + + Cygwin/X: Don't destroy min/max macros in Xwindows.h + + Now that macros named min/max rather than MIN/MAX are used consistently in the + X server, we need to ensure they work for Xwin builds. Change Xwindows.h from + simply destroying any definition of min/max, to avoiding defining them but + allowing any pre-existing definition to stand. + + Also, try to improve the comment describing why this madness is needed in the + first place, and remove a no-longer needed macro definition of sleep() + +commit 32d14e349964c5b16e83eda902d9724aac380b59 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Thu Mar 5 15:12:26 2009 -0800 + + Remove #ifdef macII code left over from ancient A/UX 3.0 support + + Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> + commit 034319189648eaaa483f9546c62451edb7be0c28 Author: James Cloos <cloos@jhcloos.com> -Date: Mon Mar 2 12:54:17 2009 -0500 +Date: Mon Mar 2 12:54:41 2009 -0500 Bump to 7.0.15. commit 391f302a7d71b9169ce4c18794251ea3ccc95904 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Tue Jan 27 20:06:04 2009 -0200 +Date: Tue Jan 27 20:06:28 2009 -0200 Janitor: Correct make distcheck and dont distribute autogen.sh commit 1e33337d4dd151da4f0898a86608a1ee67588163 Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon Oct 27 16:36:11 2008 +1030 +Date: Mon Oct 27 16:36:34 2008 +1030 Add XF86XK_Suspend and XF86XK_Hibernate keysym defs. @@ -40,7 +322,7 @@ Date: Mon Oct 27 16:36:11 2008 +1030 commit 2563153ed69d3d6f052ba275ff79df3cbe54b76d Author: James Cloos <cloos@jhcloos.com> -Date: Tue Nov 11 16:26:05 2008 -0500 +Date: Tue Nov 11 16:26:28 2008 -0500 [keysymdef.h] Add dead_currency symbol. @@ -53,7 +335,7 @@ Date: Tue Nov 11 16:26:05 2008 -0500 commit 735d745e17a6180f569f24f9792513b44e100aef Author: James Cloos <cloos@jhcloos.com> -Date: Mon Oct 13 03:11:10 2008 -0400 +Date: Mon Oct 13 03:11:33 2008 -0400 Add a dead_belowcomma keysym @@ -74,7 +356,7 @@ Date: Mon Oct 13 03:11:10 2008 -0400 commit 935dd37be409bd616ef46a4d3b62c44327b3f710 Author: Sayamindu Dasgupta <sayamindu@gmail.com> -Date: Mon Oct 13 03:00:30 2008 -0400 +Date: Mon Oct 13 03:00:53 2008 -0400 Add dead vowels in keysymdef.h @@ -91,7 +373,7 @@ Date: Mon Oct 13 03:00:30 2008 -0400 commit c43f804f44ba3d751f343c2e27d9b491a1ebb458 Author: James Cloos <cloos@jhcloos.com> -Date: Wed Sep 17 04:09:16 2008 -0400 +Date: Wed Sep 17 04:09:39 2008 -0400 Add dead keysyms for DOUBLE GRAVE and INVERTED BREVE accents @@ -101,13 +383,13 @@ Date: Wed Sep 17 04:09:16 2008 -0400 commit 33a7de5cdacb59503b26c6523ffb33dba118faed Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Thu Oct 23 22:40:38 2008 +1030 +Date: Thu Oct 23 22:41:01 2008 +1030 Bump to 7.0.14. commit 1cf41088ff751e60071a519466b5a51b65c7626a Author: Bastien Nocera <bnocera@redhat.com> -Date: Wed Oct 15 14:20:22 2008 +1030 +Date: Wed Oct 15 14:20:45 2008 +1030 Keysyms needed for some HID remote controls to work under X. #16519 @@ -119,7 +401,7 @@ Date: Wed Oct 15 14:20:22 2008 +1030 commit 0b541b3fa282531c97c6ecee574c8b92b1489bfc Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Tue Oct 14 21:55:51 2008 +1030 +Date: Tue Oct 14 21:56:14 2008 +1030 Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round). @@ -129,7 +411,7 @@ Date: Tue Oct 14 21:55:51 2008 +1030 commit c94477f16356790741ebc139d2d0b15d79c83e28 Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Tue Oct 14 21:53:53 2008 +1030 +Date: Tue Oct 14 21:54:16 2008 +1030 Revert "Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round)." @@ -140,7 +422,7 @@ Date: Tue Oct 14 21:53:53 2008 +1030 commit 2945d2f97c264783e4050a8f6c3016290014b9e2 Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Tue Oct 14 21:03:45 2008 +1030 +Date: Tue Oct 14 21:04:08 2008 +1030 Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round). @@ -150,13 +432,13 @@ Date: Tue Oct 14 21:03:45 2008 +1030 commit 610eb9698316b7cdfe378ce7776c4520f8b061ff Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Mon Oct 13 12:00:53 2008 +1030 +Date: Mon Oct 13 12:01:16 2008 +1030 Add keysyms for XF86XK_Battery, XF86XK_Bluetooth, XF86XK_WLAN, XF86XK_UWB. commit 0846d7adfe790897e879c5ed53d4f81db459a20d Author: James Cloos <cloos@jhcloos.com> -Date: Sun Jul 13 17:56:46 2008 -0400 +Date: Sun Jul 13 17:57:09 2008 -0400 Add dead_perispomeni to keysymdef.h @@ -168,50 +450,50 @@ Date: Sun Jul 13 17:56:46 2008 -0400 commit 38edd9839fa8495602378af36c67b2477b24eca2 Author: James Cloos <cloos@jhcloos.com> -Date: Sun Jul 13 17:54:24 2008 -0400 +Date: Sun Jul 13 17:54:47 2008 -0400 fix typo in commit 40ed4eef commit 53859ee4e431c21000e282971894dbe9384ed205 Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Wed May 28 17:17:15 2008 +0930 +Date: Wed May 28 17:17:38 2008 +0930 Bump to 7.0.13. commit 44e458285bb2e7771963a9ab9b5f03d2fb48e611 Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Tue May 15 16:40:45 2007 +0930 +Date: Tue May 15 16:41:08 2007 +0930 Add GenericEvent and xGenericEvent definitions. (cherry picked from commit 8a96cdca08db2563e8c4c7c9a110a3ab6d973fcc) commit 22878c30d21580146200c00070478f88d969bcaa Author: Jeremy Huddleston <jeremyhu@freedesktop.org> -Date: Thu May 8 15:02:18 2008 -0700 +Date: Thu May 8 15:02:41 2008 -0700 Apple: Added a comment to explain _DARWIN_C_SOURCE commit e3035a7e6e56e01eb79478ea5342e032ec67a190 Author: Jeremy Huddleston <jeremyhu@freedesktop.org> -Date: Thu May 8 12:15:52 2008 -0700 +Date: Thu May 8 12:16:15 2008 -0700 Apple: Define _DARWIN_C_SOURCE otherwise _XOPEN_SOURCE, _POSIX_SOURCE, or _POSIX_C_SOURCE will cause fd_mask to not be defined due to the strict namespace commit 05b119d78e1c6a4db563b2a976cee0173489f9b6 Author: Jeremy Huddleston <jeremyhu@freedesktop.org> -Date: Thu May 8 11:35:40 2008 -0700 +Date: Thu May 8 11:36:03 2008 -0700 Apple: Cleaned up some Apple definitions commit c879dab58f82f4789f27933c22706c84015f8684 Author: Alan Hourihane <alanh@tungstengraphics.com> -Date: Tue Apr 29 00:37:05 2008 +0100 +Date: Tue Apr 29 00:37:28 2008 +0100 avoid checking for fds_bits on mingw commit 8642ec676db0dd875f4d3a97d8a3cdbf6843a985 Author: Colin Harrison <colin.harrison-at-virgin.net> -Date: Sat Apr 26 18:21:18 2008 +0100 +Date: Sat Apr 26 18:21:41 2008 +0100 Use Sleep() instead of sleep() on windows @@ -219,19 +501,19 @@ Date: Sat Apr 26 18:21:18 2008 +0100 commit a893a6ac5d9fdfe9a420d1812402a01904e6482b Author: Colin Harrison <colin.harrison-at-virgin.net> -Date: Sat Apr 26 08:52:06 2008 +0100 +Date: Sat Apr 26 08:52:29 2008 +0100 Use winsock2.h commit c705bab0f6efcb6937b7ccc2fb415e701878fddb Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> -Date: Mon Apr 21 21:27:03 2008 +0100 +Date: Mon Apr 21 21:27:26 2008 +0100 Added comment to slightly discourage the definition of ever more Unicode keysyms commit 44e24a27bca023cf7b799f191fe6d52e12efbe5f Author: James Cloos <cloos@jhcloos.com> -Date: Sat Apr 12 15:48:23 2008 -0400 +Date: Sat Apr 12 15:48:46 2008 -0400 Add more dead key syms Add dead keys to support input of the precomposed latin characters in @@ -242,7 +524,7 @@ Date: Sat Apr 12 15:48:23 2008 -0400 commit 07e83988ec0b1c9577646daca3943badd5dcc0d1 Author: James Cloos <cloos@jhcloos.com> -Date: Thu Mar 6 11:33:54 2008 -0500 +Date: Thu Mar 6 11:34:17 2008 -0500 Fix typo in XF86Keysym.h @@ -251,13 +533,13 @@ Date: Thu Mar 6 11:33:54 2008 -0500 commit d34310efef11264ddff79320b8c6f03705b1208a Author: Adam Jackson <ajax@redhat.com> -Date: Wed Mar 5 22:08:53 2008 -0500 +Date: Wed Mar 5 22:09:16 2008 -0500 x11proto 7.0.12 commit e4ad7a8080e4ac0b868fa7cf39bc5ad9a6e0bee1 Author: Jeremy Huddleston <jeremy@tifa.local> -Date: Sun Feb 10 19:07:26 2008 -0800 +Date: Sun Feb 10 19:07:49 2008 -0800 Fixed #ifdef checks that were using i386 to use __i386__ @@ -274,25 +556,25 @@ Date: Sun Feb 10 19:07:26 2008 -0800 commit e49280c1c33622dbf288b0ac4f8324b01ff9b4aa Author: Jeremy Huddleston <jeremy@yuffie.local> -Date: Mon Dec 10 21:32:38 2007 -0800 +Date: Mon Dec 10 21:33:01 2007 -0800 Changed __DARWIN__ to __APPLE__ commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1 Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Oct 30 18:44:26 2007 -0700 +Date: Tue Oct 30 18:44:49 2007 -0700 Make Xalloca.h work with Sun C++ compiler commit 5ccc71161283fdb2c42da1eeb4049650f6a2f429 Author: Ben Byer <bbyer@bbyer.apple.com> -Date: Tue Oct 30 18:40:24 2007 -0700 +Date: Tue Oct 30 18:40:47 2007 -0700 fd_mask needs to be defined on OS X, too commit 8be48ca399c3efd0e5d59f53da1b37d02647f33b Author: Daniel Stone <daniel@fooishbar.org> -Date: Mon Sep 24 12:28:02 2007 +0300 +Date: Mon Sep 24 12:28:25 2007 +0300 Check headers before testing for fds_bits access method (bug #8442) @@ -301,19 +583,19 @@ Date: Mon Sep 24 12:28:02 2007 +0300 commit 68e841fb4bf489531635e6bee70f041d2c3cb87c Author: James Cloos <cloos@jhcloos.com> -Date: Sat Sep 8 08:29:54 2007 -0400 +Date: Sat Sep 8 08:30:17 2007 -0400 bump to 7.0.11 commit 11fd082a384499c38065e06065bf80f244e9909a Author: Eric Anholt <eric@anholt.net> -Date: Tue Aug 28 14:54:21 2007 -0700 +Date: Tue Aug 28 14:54:44 2007 -0700 Describe what XF86XK_Display does (or now is meant to do). commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b Author: James Cloos <cloos@jhcloos.com> -Date: Wed Aug 22 21:10:24 2007 -0400 +Date: Wed Aug 22 21:10:47 2007 -0400 Add dead_abovecomma and dead_abovereversedcomma @@ -325,7 +607,7 @@ Date: Wed Aug 22 21:10:24 2007 -0400 commit ab74d270c76b17926504815ba43ee35b8b18d3be Author: James Cloos <cloos@jhcloos.com> -Date: Wed Aug 22 21:01:25 2007 -0400 +Date: Wed Aug 22 21:01:48 2007 -0400 Comment on the new locations of the files referenced in keysymdef.h keysymdef.h has a comment from the monolithic days suggesting that @@ -336,107 +618,107 @@ Date: Wed Aug 22 21:01:25 2007 -0400 commit 1edcfdb7f5c51e5c8014c56c4d5937337b7d4302 Author: James Cloos <cloos@jhcloos.com> -Date: Tue Aug 21 00:09:45 2007 -0400 +Date: Tue Aug 21 00:10:08 2007 -0400 Add *~ to .gitignore to skip patch/emacs droppings commit d8a49874bbd05a927c42102c0c5c147cf72cb1dd Author: Colin Harrison <colin.harrison-at-virgin.net> -Date: Wed May 9 16:46:02 2007 +0100 +Date: Wed May 9 16:46:25 2007 +0100 bcopy needs definition in Xfuncs.h for Xming commit 7505880329d6b81f0c77d6aaa3995390659d5c63 Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Tue May 1 14:54:04 2007 +0200 +Date: Tue May 1 14:54:27 2007 +0200 Added some more files to .gitignore. commit 0c55a57dca2e888ba089e280f62e1c5bb55db7d7 Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Tue May 1 14:52:34 2007 +0200 +Date: Tue May 1 14:52:57 2007 +0200 Enable GCC's visibility attributes on GCC 4 or greater only. commit 30f5eedf800f6683161fca9fc3e2d6ddc9ce0ac3 Author: Zephaniah E. Hull <warp@agamemnon.b5> -Date: Fri Feb 2 15:11:03 2007 -0500 +Date: Fri Feb 2 15:11:26 2007 -0500 Add keysym definitions from Jim Gettys. commit 5951f0355c6b1c591241bccb2023e6c4d493e701 Author: Daniel Stone <daniel@fooishbar.org> -Date: Sat Dec 16 01:09:27 2006 +0200 +Date: Sat Dec 16 01:09:50 2006 +0200 bump to 7.0.10 commit 0422755ef9373fbb6f69fbb599d791331837f747 Author: Daniel Stone <daniel@fooishbar.org> -Date: Sat Dec 16 01:09:21 2006 +0200 +Date: Sat Dec 16 01:09:44 2006 +0200 don't distribute Xfuncproto.h and Xpoll.h Don't distribute these two files, as they're generated during the build. commit cf44526713681ccfb6ef929a9c25ea650c5d1a32 Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed Dec 6 19:01:56 2006 +0200 +Date: Wed Dec 6 19:02:19 2006 +0200 Makefile.am: make ChangeLog hook safer Make ChangeLog hook as safe as possible. commit 528e313fd1f1ae6f2303d3963afe41545f55ef88 Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Oct 26 00:45:21 2006 +0300 +Date: Thu Oct 26 00:45:44 2006 +0300 bump to 7.0.9 commit ab484c934301a61edc66dc1e4f554ec97b53aaf8 Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Oct 26 00:45:13 2006 +0300 +Date: Thu Oct 26 00:45:36 2006 +0300 Xfuncproto: add _X_LIKELY and _X_UNLIKELY Add gcc branch hinting annotations. commit 178cae180bc8b2e8feaaeda6d7c0317cf2715e14 Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Sep 21 18:42:43 2006 +0300 +Date: Thu Sep 21 18:43:06 2006 +0300 Xfuncproto: define _X_INLINE for older compilers commit 241e9dfd400aa21919d06fb7c78b5730eee12aab Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Sep 21 14:50:37 2006 +0300 +Date: Thu Sep 21 14:51:00 2006 +0300 bump to 7.0.8 commit e51b21e316a5a1b9442a5d972b4ffa03455aca6e Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Sep 21 14:50:22 2006 +0300 +Date: Thu Sep 21 14:50:45 2006 +0300 XF86keysym: add keyboard/monitor brightness controls (Bug #8120) Add XF86{Kbd,Mon}Brightness{Up,Down}, and XF86KbdLightOnOff. commit c3f56593f776e7f9e3e0d220c6bcf8be38a16839 Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed Sep 20 21:11:07 2006 +0300 +Date: Wed Sep 20 21:11:30 2006 +0300 Xfuncproto: add _X_INLINE commit 4fb2e257ae6de38971be8005283402226aea1ee5 Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Jul 14 17:58:56 2006 -0700 +Date: Fri Jul 14 17:59:19 2006 -0700 Replace manual ChangeLog with dist-hook to generate from git log commit 2153ef4b7c2a93cba39ae08352ea2c46e5f0eefb Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Jul 14 17:54:15 2006 -0700 +Date: Fri Jul 14 17:54:38 2006 -0700 renamed: .cvsignore -> .gitignore commit 0b76eb310307cd16e55d0c0792b54a2c6774fb88 Author: Dan McNichol <mcnichol@austin.ibm.com> -Date: Fri Jul 14 17:53:11 2006 -0700 +Date: Fri Jul 14 17:53:34 2006 -0700 Bug #7458: AIX changes to Xmd.h @@ -445,43 +727,43 @@ Date: Fri Jul 14 17:53:11 2006 -0700 commit bb7584b5c88236c59c4e3040bc7c28c150abf048 Author: Daniel Stone <daniel@fooishbar.org> -Date: Sat Jun 10 15:33:27 2006 +0000 +Date: Sat Jun 10 15:33:50 2006 +0000 Add ISO_Level5_{Shift,Latch,Lock}. commit e9aebeae3661d4c464c7aa53722d0a6bf915101a Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Jun 1 23:30:57 2006 +0000 +Date: Thu Jun 1 23:31:20 2006 +0000 Bug #6887: Add dead_stroke, bump to 7.0.7. (Troy Korjuslommi) commit f3886640d29026359ffc4add39b66b8ff48472d3 Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Jun 1 23:00:11 2006 +0000 +Date: Thu Jun 1 23:00:34 2006 +0000 Bump to 7.0.6. commit d10d0302be37adb22804270926332e9d701935bb Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Jun 1 22:59:40 2006 +0000 +Date: Thu Jun 1 23:00:03 2006 +0000 Bug #6296: Add support for Braille. (Samuel Thibault) commit 0471bfcce2787d2f1ff0fc2d019840e2bae8bc49 Author: Adam Jackson <ajax@nwnk.net> -Date: Wed Apr 26 23:26:26 2006 +0000 +Date: Wed Apr 26 23:26:49 2006 +0000 Bump to 7.0.5 commit 2a2b6db1f78f94c8f3690f675f0c032401fb2541 Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Tue Apr 25 23:59:39 2006 +0000 +Date: Wed Apr 26 00:00:02 2006 +0000 Fix more comment typos. commit 33cea539618d58d64efb6a5c0465d14a471256cd Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Thu Apr 20 01:24:02 2006 +0000 +Date: Thu Apr 20 01:24:25 2006 +0000 On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined in 64-bit builds. @@ -489,31 +771,31 @@ Date: Thu Apr 20 01:24:02 2006 +0000 commit 5e7d5cbf21c33f883ab508a51422775f59c4da00 Author: Kevin E Martin <kem@kem.org> -Date: Thu Dec 15 00:24:17 2005 +0000 +Date: Thu Dec 15 00:24:39 2005 +0000 Update package version number for final X11R7 release candidate. commit 1827a78f3a23c77dbcddfc8227d85c5add59d819 Author: Kevin E Martin <kem@kem.org> -Date: Sat Dec 3 05:49:25 2005 +0000 +Date: Sat Dec 3 05:49:47 2005 +0000 Update package version number for X11R7 RC3 release. commit 45811c86eb34e9f09e7d807ba4633107513f0d52 Author: Kevin E Martin <kem@kem.org> -Date: Sat Dec 3 01:13:14 2005 +0000 +Date: Sat Dec 3 01:13:36 2005 +0000 Automatically generate FUNCPROTO and NARROWPROTO defines in Xfuncproto.h. commit c03cc7739b37ca504a2b56a73945755c41c68b2a Author: Eric Anholt <anholt@freebsd.org> -Date: Mon Nov 21 10:50:53 2005 +0000 +Date: Mon Nov 21 10:51:15 2005 +0000 Ignore Xpoll.h, which is generated now. commit 54c8ddf303053fb398e00fc8a35df712a7f3d47d Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Mon Nov 21 02:46:59 2005 +0000 +Date: Mon Nov 21 02:47:21 2005 +0000 Change values of XK_MATHEMATICAL symbols to use 0x1000000 + Unicode value, as Xorg Architecture Task Force agreed last year should be done for all @@ -521,57 +803,57 @@ Date: Mon Nov 21 02:46:59 2005 +0000 commit f13eca1bc0feba2476f87e019a4ef40693a61ed8 Author: Kevin E Martin <kem@kem.org> -Date: Wed Nov 9 21:20:11 2005 +0000 +Date: Wed Nov 9 21:20:33 2005 +0000 Update package version number for X11R7 RC2 release. commit 448763bde4a31cb012ad17cd6c5159411102432b Author: Kean Johnson <kean@armory.com> -Date: Tue Nov 8 06:33:03 2005 +0000 +Date: Tue Nov 8 06:33:25 2005 +0000 See ChangeLog entry 2005-11-07 for details. commit 59a5a5ebb6781d417d7a4d5905999da5fc76a083 Author: Kevin E Martin <kem@kem.org> -Date: Wed Oct 19 02:47:53 2005 +0000 +Date: Wed Oct 19 02:48:15 2005 +0000 Update package version number for RC1 release. commit 3f74cc5e8309b2a4ac7671ca3c52c304ec5aa57f Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Sat Oct 15 00:48:05 2005 +0000 +Date: Sat Oct 15 00:48:27 2005 +0000 Remove duplicate keysyms accidentally added to XK_MATHEMATICAL section. commit eaffdc0d593b94d9036033911535371e73698573 Author: Daniel Stone <daniel@fooishbar.org> -Date: Sun Oct 9 15:37:07 2005 +0000 +Date: Sun Oct 9 15:37:29 2005 +0000 Bug #4688: Add various mathematical keysyms (all Unicode). commit 40b6e64fb1084f7b0270c279ac7132e52886c912 Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sun Aug 21 15:27:05 2005 +0000 +Date: Sun Aug 21 15:27:27 2005 +0000 define CSRG_BASED here on systems that used to define it in Imake configuration. For use in the modular tree. commit 04f9f7fd17cab16e5b0b135409011c0d284b002c Author: Eric Anholt <anholt@freebsd.org> -Date: Tue Aug 2 19:19:18 2005 +0000 +Date: Tue Aug 2 19:19:40 2005 +0000 Add basic .cvsignore files for proto modules. commit cd0400eeda5d7818232844d93343877ef0ff8168 Author: Adam Jackson <ajax@nwnk.net> -Date: Tue Aug 2 18:36:08 2005 +0000 +Date: Tue Aug 2 18:36:30 2005 +0000 Fix the fds_bits test on OSX and maybe others. OSX defines fd_set in <sys/types.h> just to be perverse. commit a475adb523a4d24cd53d436ba8c98ac7c8d37934 Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Sat Jul 30 21:07:03 2005 +0000 +Date: Sat Jul 30 21:07:25 2005 +0000 Add prototypes of Xalloc/free functions. Export ImUtil.h to match modular tree install. @@ -580,7 +862,7 @@ Date: Sat Jul 30 21:07:03 2005 +0000 commit f6bd2288d3630ff7cb864e54cc7ebab1b3069067 Author: Kevin E Martin <kem@kem.org> -Date: Fri Jul 29 21:22:35 2005 +0000 +Date: Fri Jul 29 21:22:57 2005 +0000 Various changes preparing packages for RC0: - Verify and update package version numbers as needed @@ -594,14 +876,14 @@ Date: Fri Jul 29 21:22:35 2005 +0000 commit 74a3f7f77830e4417a4bc4145114030dfaef6f4e Author: Daniel Stone <daniel@fooishbar.org> -Date: Sat Jul 23 02:53:10 2005 +0000 +Date: Sat Jul 23 02:53:32 2005 +0000 Remove all _XOPEN_SOURCE definitions from Xos.h, as Xpoll.h.in now deals with this by using which of fds_bits or __fds_bits we have. commit f97e34e65e403140dde00d260be0fd7f853ac8f0 Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jul 22 08:01:17 2005 +0000 +Date: Fri Jul 22 08:01:39 2005 +0000 Add includex11dir as a path to the includes, sans X11/. Turn Xpoll.h into a generated file. In the modular tree, substitute in @@ -612,20 +894,20 @@ Date: Fri Jul 22 08:01:17 2005 +0000 commit 7a9ce57163172557d6ba41119a5a3b2837dbbc8e Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Sat Jul 16 20:53:51 2005 +0000 +Date: Sat Jul 16 20:54:13 2005 +0000 Guard INCLUDE_ALLOCA_H define to end redefinition warnings. commit 825b6ae347b3896b8ea38e6021170d45ae3bfd65 Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Thu Jul 14 22:08:16 2005 +0000 +Date: Thu Jul 14 22:08:38 2005 +0000 Don't define _XOPEN_SOURCE on SVR4, because it will REMOVE required definitions. commit acc0551fb1af1152c1b630ff5e82f023f11751e2 Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Wed Jul 13 23:42:46 2005 +0000 +Date: Wed Jul 13 23:43:08 2005 +0000 #define INCLUDE_ALLOCA_H when building with Sun compilers. (Imake *.cf files define this for a number of platforms in the monolith, but these @@ -634,14 +916,14 @@ Date: Wed Jul 13 23:42:46 2005 +0000 commit b8301067b6e962a3dc786dd909726b7e6cb81085 Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> -Date: Wed Jul 13 20:11:51 2005 +0000 +Date: Wed Jul 13 20:12:13 2005 +0000 include <X11/Xwindows.h> instead of <windows.h>. Several namespace conflicts are worked around in Xwindows.h commit ec7a156bcdbe8e4bddf232d4a03f47d426096736 Author: Keith Packard <keithp@keithp.com> -Date: Wed Jul 13 07:23:34 2005 +0000 +Date: Wed Jul 13 07:23:56 2005 +0000 Make some minor source adjustments so that we don not need to use -D_XOPEN_SOURCE -D_BSD_SOURCE everywhere as this will leak out of the @@ -650,13 +932,13 @@ Date: Wed Jul 13 07:23:34 2005 +0000 commit 2a0445903d06c332acf70cfd18ba57ddbbeada32 Author: Daniel Stone <daniel@fooishbar.org> -Date: Sun Jul 3 07:54:38 2005 +0000 +Date: Sun Jul 3 07:55:00 2005 +0000 Move misc.h and os.h from proto/X11 to xserver/xorg/include. commit ef6f542053b30af29b8045ffa6ce26386aab7bba Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Tue Jun 28 13:15:05 2005 +0000 +Date: Tue Jun 28 13:15:27 2005 +0000 - Remove xfixes.pc.in from lib/lbxutil - Add missing backslash in proto/X11/Makefile.am @@ -664,7 +946,7 @@ Date: Tue Jun 28 13:15:05 2005 +0000 commit 4cf89be7baf8a79d2d399abd17c4e23279cca364 Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Mon Jun 27 17:40:47 2005 +0000 +Date: Mon Jun 27 17:41:09 2005 +0000 - Add os.h and misc.h to proto/X11 - In symlink.sh move os.h and misc.h from xserver/include to proto/X11 @@ -672,7 +954,7 @@ Date: Mon Jun 27 17:40:47 2005 +0000 commit e575c5104a8627428dd18c4040d4ad787655164a Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Wed May 25 22:11:59 2005 +0000 +Date: Wed May 25 22:12:21 2005 +0000 - Use XTRANS_CONNECTION_FLAGS macro in lib/FS/configure.ac - Don't symlink transport.c, which is a generated file @@ -680,7 +962,7 @@ Date: Wed May 25 22:11:59 2005 +0000 commit 207e3f82011d5f83db0eca318a1de50f0c1da0dc Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Wed May 25 21:47:34 2005 +0000 +Date: Wed May 25 21:47:56 2005 +0000 - Add FSlib to symlink.sh - Change Xtrans includedir back to be X11/Xtrans, so that users of it can @@ -692,7 +974,7 @@ Date: Wed May 25 21:47:34 2005 +0000 commit a5a4bfe9b432e7d8238f9a02d80be4ce6bb64978 Author: Josh Triplett <josh@speakeasy.net> -Date: Mon May 23 01:21:48 2005 +0000 +Date: Mon May 23 01:22:10 2005 +0000 The macros in Xpoll.h poke at the guts of struct fd_set in ways that only work if _XOPEN_SOURCE is defined, so define it in Cflags in the @@ -700,37 +982,37 @@ Date: Mon May 23 01:21:48 2005 +0000 commit 2f4c3aa871a047359f8121e6401be1ba4cf0b8e0 Author: Adam Jackson <ajax@nwnk.net> -Date: Thu May 19 00:22:18 2005 +0000 +Date: Thu May 19 00:22:40 2005 +0000 revert last change, didn't do right thing at all, sorry for the noise commit 4809dd9150599a9e88f64cd1b82737872b7b1b94 Author: Adam Jackson <ajax@nwnk.net> -Date: Thu May 19 00:09:57 2005 +0000 +Date: Thu May 19 00:10:19 2005 +0000 Require automake 1.7 in AM_INIT_AUTOMAKE commit 6ff17c33f0773e152122d66cbaffaa54e53e086c Author: Josh Triplett <josh@speakeasy.net> -Date: Sat May 14 07:56:27 2005 +0000 +Date: Sat May 14 07:56:49 2005 +0000 Add AUTHORS file for X11 from xlibs tree. commit 3f8b0ba6071dcdd62ea424cab0bddb39db2ebe6a Author: Josh Triplett <josh@speakeasy.net> -Date: Sat May 14 07:54:48 2005 +0000 +Date: Sat May 14 07:55:10 2005 +0000 Add some COPYING files. commit 803c8ecaba2f8c703bbb46c0d740bfa349ce0245 Author: Kevin E Martin <kem@kem.org> -Date: Fri May 6 01:46:09 2005 +0000 +Date: Fri May 6 01:46:31 2005 +0000 Initial build system files for proto module. commit a870c60741273ebd6cb1e69b4e535ce3a6bc76bf Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Thu Apr 28 22:03:50 2005 +0000 +Date: Thu Apr 28 22:04:12 2005 +0000 Don't define X_NOT_STDC_ENV on Solaris x86. Bugzilla #3158: https://bugs.freedesktop.org/show_bug.cgi?id=3158 Patch #2588: @@ -739,13 +1021,13 @@ Date: Thu Apr 28 22:03:50 2005 +0000 commit 372f37171ba3875ea4bf7f60150d92869e06010f Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> -Date: Wed Apr 20 13:57:55 2005 +0000 +Date: Wed Apr 20 13:58:17 2005 +0000 check for define PATH_MAX before referencing it commit e489ec65b4b2ab0a050d8dbf7ec0658e6decb8b3 Author: Alan Coopersmith <Alan.Coopersmith@sun.com> -Date: Wed Mar 2 19:29:09 2005 +0000 +Date: Wed Mar 2 19:29:31 2005 +0000 Patch #2007 <https://bugs.freedesktop.org/attachment.cgi?id=2007> 1) Fix Solaris #ifdefs to choose between UI/SVR4 (early POSIX draft) and @@ -756,7 +1038,7 @@ Date: Wed Mar 2 19:29:09 2005 +0000 commit d761e87224d3e60c5355ac3e3468835fc3b4be92 Author: Roland Mainz <roland.mainz@nrubsig.org> -Date: Wed Mar 2 11:20:07 2005 +0000 +Date: Wed Mar 2 11:20:29 2005 +0000 xc/config/cf/DragonFly.cf xc/config/cf/Imake.cf @@ -776,99 +1058,99 @@ Date: Wed Mar 2 11:20:07 2005 +0000 commit 1cae0cb4b1442b34d76ee5623fb2a17ed2353c50 Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> -Date: Sun Jan 9 15:05:42 2005 +0000 +Date: Sun Jan 9 15:06:04 2005 +0000 Make sure PATH_MAX is at least 1024 commit 9df4ffce552a0f6eca47764a3f79b466629e8bab Author: Egbert Eich <eich@suse.de> -Date: Mon Jan 3 18:03:27 2005 +0000 +Date: Mon Jan 3 18:03:49 2005 +0000 gcc 4 doesn't like predeffines line 'linux' any more. To muffle the compiler replace them with __linux__ (Bugzilla #2207). commit dd82af84ed67f439444e75ea1d032c082e15db51 Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> -Date: Mon Nov 15 15:06:31 2004 +0000 +Date: Mon Nov 15 15:06:53 2004 +0000 Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added mingw (Win32) port commit 618956f1f783a8c330aab8eac425937f0b8e50e1 Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> -Date: Sun Sep 26 20:45:56 2004 +0000 +Date: Sun Sep 26 20:46:18 2004 +0000 The big keysym cleanup, to bring implementation in line with the recent revision of Appendix A of the protocol spec. (Markus Kuhn) commit 7cb1490d8932d745b3a5e2b3370a000da064306f Author: Kevin E Martin <kem@kem.org> -Date: Wed Aug 11 21:13:54 2004 +0000 +Date: Wed Aug 11 21:14:16 2004 +0000 Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith). commit 5b67de2bce0e33a4a85439ebcf7b726a6da24545 Author: Egbert Eich <eich@suse.de> -Date: Fri Apr 23 18:42:43 2004 +0000 +Date: Fri Apr 23 18:43:05 2004 +0000 Merging XORG-CURRENT into trunk commit e88a09c1df46637979c4d131a8e41af923ff4d45 Author: Egbert Eich <eich@suse.de> -Date: Sun Mar 14 08:31:12 2004 +0000 +Date: Sun Mar 14 08:31:34 2004 +0000 Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 commit 9259b43390c50d330f557390cc4576f5315c3f53 Author: Egbert Eich <eich@suse.de> -Date: Wed Mar 3 12:10:31 2004 +0000 +Date: Wed Mar 3 12:10:53 2004 +0000 Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 commit 99bbbc3fcaf67b02a50e4ff4007225b1b64beb36 Author: Egbert Eich <eich@suse.de> -Date: Thu Feb 26 13:34:49 2004 +0000 +Date: Thu Feb 26 13:35:11 2004 +0000 readding XFree86's cvs IDs commit 82d7bb39bc84eb16134e931263f53bc88d1788ac Author: Egbert Eich <eich@suse.de> -Date: Thu Feb 26 09:22:02 2004 +0000 +Date: Thu Feb 26 09:22:24 2004 +0000 Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 commit 0700ff31a84abc06fdf4b05c2328ff2329dc909c Author: Egbert Eich <eich@suse.de> -Date: Thu Jan 29 08:07:32 2004 +0000 +Date: Thu Jan 29 08:07:54 2004 +0000 Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 commit ad76b5cc436937d9fb945bd43d9356651fe182ca Author: Kaleb Keithley <kaleb@freedesktop.org> -Date: Fri Dec 19 20:53:58 2003 +0000 +Date: Fri Dec 19 20:54:20 2003 +0000 XFree86 4.3.99.902 (RC 2) commit 376f9efdab6ef2dce267caa0a0228892e768e390 Author: Kaleb Keithley <kaleb@freedesktop.org> -Date: Tue Nov 25 19:27:39 2003 +0000 +Date: Tue Nov 25 19:28:01 2003 +0000 XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks commit 5ec315b967cb1ae519f514896f0b48fb5407f863 Author: Kaleb Keithley <kaleb@freedesktop.org> -Date: Fri Nov 14 16:48:20 2003 +0000 +Date: Fri Nov 14 16:48:42 2003 +0000 XFree86 4.3.0.1 commit f2001f5bd5316842106a98b23f09400688575fa3 Author: Kaleb Keithley <kaleb@freedesktop.org> -Date: Fri Nov 14 16:48:20 2003 +0000 +Date: Fri Nov 14 16:48:42 2003 +0000 Initial revision commit ee0a1a43dc707f960e637fdf2118723e4de0a55d Author: Kaleb Keithley <kaleb@freedesktop.org> -Date: Fri Nov 14 15:54:13 2003 +0000 +Date: Fri Nov 14 15:54:35 2003 +0000 R6.6 is the Xorg base-line diff --git a/proto/x11proto/DECkeysym.h b/proto/x11proto/DECkeysym.h index 6ab103e5d..07307169d 100644 --- a/proto/x11proto/DECkeysym.h +++ b/proto/x11proto/DECkeysym.h @@ -1,5 +1,3 @@ -/* $Xorg: DECkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ - /*********************************************************** Copyright 1988, 1998 The Open Group diff --git a/proto/x11proto/HPkeysym.h b/proto/x11proto/HPkeysym.h index 2d09277d8..ed000b167 100644 --- a/proto/x11proto/HPkeysym.h +++ b/proto/x11proto/HPkeysym.h @@ -1,4 +1,3 @@ -/* $Xorg: HPkeysym.h,v 1.5 2001/02/09 02:03:22 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group diff --git a/proto/x11proto/INSTALL b/proto/x11proto/INSTALL new file mode 100644 index 000000000..8b82ade08 --- /dev/null +++ b/proto/x11proto/INSTALL @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/proto/x11proto/Makefile.am b/proto/x11proto/Makefile.am index 96c6b2604..26b99954a 100644 --- a/proto/x11proto/Makefile.am +++ b/proto/x11proto/Makefile.am @@ -32,14 +32,16 @@ nodist_xproto_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xproto.pc -EXTRA_DIST = xproto.pc.in ChangeLog -CLEANFILES=ChangeLog +MAINTAINERCLEANFILES = ChangeLog INSTALL -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/proto/x11proto/README b/proto/x11proto/README new file mode 100644 index 000000000..f310ce8c7 --- /dev/null +++ b/proto/x11proto/README @@ -0,0 +1,25 @@ + X Window System Core Protocol + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/proto/x11proto + + http://cgit.freedesktop.org/xorg/proto/x11proto + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff --git a/proto/x11proto/Sunkeysym.h b/proto/x11proto/Sunkeysym.h index e72344440..87e7f119b 100644 --- a/proto/x11proto/Sunkeysym.h +++ b/proto/x11proto/Sunkeysym.h @@ -1,5 +1,25 @@ -/* $Xorg: Sunkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ - +/* + * Copyright © 1991 Sun Microsystems, Inc. All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ /************************************************************ Copyright 1991, 1998 The Open Group @@ -24,32 +44,6 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. - -Copyright 1991 by Sun Microsystems, Inc. Mountain View, CA. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this -software and its documentation for any purpose and without -fee is hereby granted, provided that the above copyright no- -tice appear in all copies and that both that copyright no- -tice and this permission notice appear in supporting docu- -mentation, and that the name of Sun not be used in -advertising or publicity pertaining to distribution of the -software without specific prior written permission. Sun -makes no representations about the suitability of this -software for any purpose. It is provided "as is" without any -express or implied warranty. - -SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- -NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- -ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTUOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH -THE USE OR PERFORMANCE OF THIS SOFTWARE. - ***********************************************************/ /* diff --git a/proto/x11proto/X.h b/proto/x11proto/X.h index ebcc767da..5cf695d7b 100644 --- a/proto/x11proto/X.h +++ b/proto/x11proto/X.h @@ -1,7 +1,3 @@ -/* - * $Xorg: X.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ - */ - /* Definitions for the X window system likely to be used by applications */ #ifndef X_H @@ -53,7 +49,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/X.h,v 1.6 2003/07/09 15:27:28 tsi Exp $ */ #define X_PROTOCOL 11 /* current protocol version */ #define X_PROTOCOL_REVISION 0 /* current minor version */ diff --git a/proto/x11proto/XF86keysym.h b/proto/x11proto/XF86keysym.h index 072807ef9..200f5c1fe 100644 --- a/proto/x11proto/XF86keysym.h +++ b/proto/x11proto/XF86keysym.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/include/XF86keysym.h,v 1.16 2003/02/11 02:51:10 dawes Exp $ */ - /* * XFree86 vendor specific keysyms. * @@ -208,6 +206,7 @@ #define XF86XK_Suspend 0x1008FFA7 /* Sleep to RAM */ #define XF86XK_Hibernate 0x1008FFA8 /* Sleep to disk */ +#define XF86XK_TouchpadToggle 0x1008FFA9 /* Toggle between touchpad/trackstick */ /* Keys for special action keys (hot keys) */ /* Virtual terminals on some operating systems */ diff --git a/proto/x11proto/XWDFile.h b/proto/x11proto/XWDFile.h index 0ce22e1a8..50e17df3d 100644 --- a/proto/x11proto/XWDFile.h +++ b/proto/x11proto/XWDFile.h @@ -1,4 +1,3 @@ -/* $Xorg: XWDFile.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1998 The Open Group diff --git a/proto/x11proto/Xalloca.h b/proto/x11proto/Xalloca.h index c5617188a..1919884bb 100644 --- a/proto/x11proto/Xalloca.h +++ b/proto/x11proto/Xalloca.h @@ -1,5 +1,3 @@ -/* $Xorg: Xalloca.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ - /* Copyright 1995, 1998 The Open Group @@ -27,8 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/Xalloca.h,v 3.10 2001/12/14 19:53:25 dawes Exp $ */ - /* * The purpose of this header is to define the macros ALLOCATE_LOCAL and * DEALLOCATE_LOCAL appropriately for the platform being compiled on. @@ -78,19 +74,6 @@ from The Open Group. * If you want something other than (DE)ALLOCATE_LOCAL_FALLBACK * for ALLOCATE/DEALLOCATE_LOCAL then you add that in here. */ -# if defined(__HIGHC__) -# ifndef NCR - extern char *alloca(); -# if HCVERSION < 21003 -# define ALLOCATE_LOCAL(size) alloca((int)(size)) - pragma on(alloca); -# else /* HCVERSION >= 21003 */ -# define ALLOCATE_LOCAL(size) _Alloca((int)(size)) -# endif /* HCVERSION < 21003 */ -# else /* NCR */ -# define ALLOCATE_LOCAL(size) alloca(size) -# endif -# endif /* defined(__HIGHC__) */ # ifdef __GNUC__ @@ -105,24 +88,18 @@ from The Open Group. * Test is easy, the new one is named __builtin_alloca and comes * from alloca.h which #defines alloca. */ -# ifndef NCR -# if defined(vax) || defined(sun) || defined(apollo) || defined(stellar) || defined(alloca) +# if defined(__sun) || defined(alloca) /* * Some System V boxes extract alloca.o from /lib/libPW.a; if you * decide that you don't want to use alloca, you might want to fix it here. */ /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */ -# if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus) +# if !defined(__cplusplus) # define __Xnullarg /* as nothing */ -# ifndef X_NOT_STDC_ENV - extern void *alloca(__Xnullarg); -# else - extern char *alloca(__Xnullarg); -# endif -# endif /* !__sgi && !__QNX && !__cplusplus */ + extern void *alloca(__Xnullarg); +# endif # define ALLOCATE_LOCAL(size) alloca((int)(size)) # endif /* who does alloca */ -# endif /* NCR */ # endif /* __GNUC__ */ #endif /* NO_ALLOCA */ diff --git a/proto/x11proto/Xarch.h b/proto/x11proto/Xarch.h index 6e04e53f6..58fb9a5d8 100644 --- a/proto/x11proto/Xarch.h +++ b/proto/x11proto/Xarch.h @@ -1,5 +1,5 @@ #ifndef _XARCH_H_ -#define _XARCH_H_ +# define _XARCH_H_ /* * Copyright 1997 Metro Link Incorporated @@ -25,7 +25,6 @@ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/include/Xarch.h,v 1.10tsi Exp $ */ /* @@ -33,94 +32,62 @@ */ /* See if it is set in the imake config first */ -#ifdef X_BYTE_ORDER +# ifdef X_BYTE_ORDER -#define X_BIG_ENDIAN 4321 -#define X_LITTLE_ENDIAN 1234 +# define X_BIG_ENDIAN 4321 +# define X_LITTLE_ENDIAN 1234 -#else +# else -#ifdef SVR4 -#if defined(NCR) || defined(Mips) || defined(__sgi) -#include <sys/endian.h> -#else -#if !defined(sun) -#include <sys/byteorder.h> -#endif -#endif -#elif defined(CSRG_BASED) -#if defined(__NetBSD__) || defined(__OpenBSD__) -#include <sys/types.h> -#endif -#include <machine/endian.h> -#elif defined(linux) -#if defined __STRICT_ANSI__ -#undef __STRICT_ANSI__ -#include <endian.h> -#define __STRICT_ANSI__ -#else -#include <endian.h> -#endif +# if defined(SVR4) || defined(__SVR4) +# include <sys/byteorder.h> +# elif defined(CSRG_BASED) +# if defined(__NetBSD__) || defined(__OpenBSD__) +# include <sys/types.h> +# endif +# include <machine/endian.h> +# elif defined(linux) +# if defined __STRICT_ANSI__ +# undef __STRICT_ANSI__ +# include <endian.h> +# define __STRICT_ANSI__ +# else +# include <endian.h> +# endif /* 'endian.h' might have been included before 'Xarch.h' */ -#if !defined(LITTLE_ENDIAN) && defined(__LITTLE_ENDIAN) -#define LITTLE_ENDIAN __LITTLE_ENDIAN -#endif -#if !defined(BIG_ENDIAN) && defined(__BIG_ENDIAN) -#define BIG_ENDIAN __BIG_ENDIAN -#endif -#if !defined(PDP_ENDIAN) && defined(__PDP_ENDIAN) -#define PDP_ENDIAN __PDP_ENDIAN -#endif -#if !defined(BYTE_ORDER) && defined(__BYTE_ORDER) -#define BYTE_ORDER __BYTE_ORDER -#endif -#elif defined(Lynx) -#if 0 -/* LynxOS 2.4.0 has wrong defines in bsd/ip.h */ -#include <bsd/in.h> -#include <bsd/in_systm.h> -#include <bsd/ip.h> -#endif -#endif +# if !defined(LITTLE_ENDIAN) && defined(__LITTLE_ENDIAN) +# define LITTLE_ENDIAN __LITTLE_ENDIAN +# endif +# if !defined(BIG_ENDIAN) && defined(__BIG_ENDIAN) +# define BIG_ENDIAN __BIG_ENDIAN +# endif +# if !defined(PDP_ENDIAN) && defined(__PDP_ENDIAN) +# define PDP_ENDIAN __PDP_ENDIAN +# endif +# if !defined(BYTE_ORDER) && defined(__BYTE_ORDER) +# define BYTE_ORDER __BYTE_ORDER +# endif +# endif -#ifndef BYTE_ORDER -#define LITTLE_ENDIAN 1234 -#define BIG_ENDIAN 4321 +# ifndef BYTE_ORDER +# define LITTLE_ENDIAN 1234 +# define BIG_ENDIAN 4321 -#if defined(__QNX__) && !defined(__QNXNTO__) -#define BYTE_ORDER LITTLE_ENDIAN -#endif +# if defined(__sun) && defined(__SVR4) +# include <sys/isa_defs.h> +# ifdef _LITTLE_ENDIAN +# define BYTE_ORDER LITTLE_ENDIAN +# endif +# ifdef _BIG_ENDIAN +# define BYTE_ORDER BIG_ENDIAN +# endif +# endif /* sun */ +# endif /* BYTE_ORDER */ -#if defined(__QNXNTO__) -#if defined(i386) || defined(__i386__) || defined(__x86__) -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN -#endif -#endif +# define X_BYTE_ORDER BYTE_ORDER +# define X_BIG_ENDIAN BIG_ENDIAN +# define X_LITTLE_ENDIAN LITTLE_ENDIAN -#ifdef Lynx -#if defined(i386) || defined(__i386__) || defined(__x86__) -#define BYTE_ORDER LITTLE_ENDIAN -#else -#define BYTE_ORDER BIG_ENDIAN -#endif -#endif -#if (defined(sun) && defined(SVR4)) && !defined(Lynx) -#include <sys/isa_defs.h> -#ifdef _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif -#ifdef _BIG_ENDIAN -#define BYTE_ORDER BIG_ENDIAN -#endif -#endif /* sun */ -#endif /* BYTE_ORDER */ - -#define X_BYTE_ORDER BYTE_ORDER -#define X_BIG_ENDIAN BIG_ENDIAN -#define X_LITTLE_ENDIAN LITTLE_ENDIAN - -#endif /* not in imake config */ +# endif /* not in imake config */ #endif /* _XARCH_H_ */ diff --git a/proto/x11proto/Xdefs.h b/proto/x11proto/Xdefs.h index 5ee2d8949..46ffdad88 100644 --- a/proto/x11proto/Xdefs.h +++ b/proto/x11proto/Xdefs.h @@ -1,5 +1,3 @@ -/* $XFree86: xc/include/Xdefs.h,v 1.2 1999/08/22 06:21:20 dawes Exp $ */ - /*********************************************************** Copyright (c) 1999 The XFree86 Project Inc. diff --git a/proto/x11proto/Xfuncproto.h.in b/proto/x11proto/Xfuncproto.h.in index 2421ae4d2..96a585ce8 100644 --- a/proto/x11proto/Xfuncproto.h.in +++ b/proto/x11proto/Xfuncproto.h.in @@ -1,4 +1,3 @@ -/* $Xorg: Xfuncproto.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ /* * Copyright 1989, 1991, 1998 The Open Group @@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/include/Xfuncproto.h,v 3.4 2001/12/14 19:53:25 dawes Exp $ */ /* Definitions to make function prototypes manageable */ @@ -85,7 +83,7 @@ in this Software without prior written authorization from The Open Group. # define _X_ATTRIBUTE_PRINTF(x,y) #endif /* GNUC >= 4 */ -#if defined(__GNUC__) && (__GNUC__ >= 4) +#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) # define _X_EXPORT __attribute__((visibility("default"))) # define _X_HIDDEN __attribute__((visibility("hidden"))) # define _X_INTERNAL __attribute__((visibility("internal"))) @@ -119,4 +117,10 @@ in this Software without prior written authorization from The Open Group. # define _X_DEPRECATED #endif +#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205) +# define _X_NORETURN __attribute((noreturn)) +#else +# define _X_NORETURN +#endif /* GNUC */ + #endif /* _XFUNCPROTO_H_ */ diff --git a/proto/x11proto/Xfuncs.h b/proto/x11proto/Xfuncs.h index 2469b69a9..354b66326 100644 --- a/proto/x11proto/Xfuncs.h +++ b/proto/x11proto/Xfuncs.h @@ -1,7 +1,4 @@ /* - * $XdotOrg: xc/include/Xfuncs.h,v 1.2 2004/04/23 18:43:05 eich Exp $ - * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ - * * Copyright 1990, 1998 The Open Group @@ -26,73 +23,47 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/include/Xfuncs.h,v 3.10 2002/05/31 18:45:38 dawes Exp $ */ #ifndef _XFUNCS_H_ -#define _XFUNCS_H_ +# define _XFUNCS_H_ -#include <X11/Xosdefs.h> +# include <X11/Xosdefs.h> /* the old Xfuncs.h, for pre-R6 */ -#if !(defined(XFree86LOADER) && defined(IN_MODULE)) +# if !(defined(XFree86LOADER) && defined(IN_MODULE)) -#ifdef X_USEBFUNCS +# ifdef X_USEBFUNCS void bcopy(); void bzero(); int bcmp(); -#else -#if defined(SYSV) && !defined(__SCO__) && !defined(sun) && !defined(__UNIXWARE__) -#include <memory.h> +# else +# if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__) +# include <memory.h> void bcopy(); -#define bzero(b,len) memset(b, 0, len) -#define bcmp(b1,b2,len) memcmp(b1, b2, len) -#else -#include <string.h> -#if defined(__SCO__) || defined(sun) || defined(__UNIXWARE__) -#include <strings.h> -#endif -#define _XFUNCS_H_INCLUDED_STRING_H -#if defined(sun) -#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len)) -#define bzero(b,len) memset(b, 0, (size_t)(len)) -#define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len)) -#endif -#endif -#endif /* X_USEBFUNCS */ +# define bzero(b,len) memset(b, 0, len) +# define bcmp(b1,b2,len) memcmp(b1, b2, len) +# else +# include <string.h> +# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) +# include <strings.h> +# endif +# define _XFUNCS_H_INCLUDED_STRING_H +# endif +# endif /* X_USEBFUNCS */ /* the new Xfuncs.h */ -#if !defined(X_NOT_STDC_ENV) && (!defined(sun) || defined(SVR4)) /* the ANSI C way */ -#ifndef _XFUNCS_H_INCLUDED_STRING_H -#include <string.h> -#endif -#undef bzero -#define bzero(b,len) memset(b,0,len) -#else /* else X_NOT_STDC_ENV or SunOS 4 */ -#if defined(SYSV) || defined(luna) || defined(sun) || defined(__sxg__) -#include <memory.h> -#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len)) -#if defined(SYSV) && defined(_XBCOPYFUNC) -#undef memmove -#define memmove(dst,src,len) _XBCOPYFUNC((char *)(src),(char *)(dst),(int)(len)) -#define _XNEEDBCOPYFUNC -#endif -#else /* else vanilla BSD */ -#define memmove(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len)) -#define memcpy(dst,src,len) bcopy((char *)(src),(char *)(dst),(int)(len)) -#define memcmp(b1,b2,len) bcmp((char *)(b1),(char *)(b2),(int)(len)) -#endif /* SYSV else */ -#endif /* ! X_NOT_STDC_ENV else */ - -#if defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) -#define atexit(f) on_exit(f, 0) -#endif +# ifndef _XFUNCS_H_INCLUDED_STRING_H +# include <string.h> +# endif +# undef bzero +# define bzero(b,len) memset(b,0,len) -#if defined WIN32 && defined __MINGW32__ -#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len)) -#endif +# if defined WIN32 && defined __MINGW32__ +# define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len)) +# endif -#endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */ +# endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */ #endif /* _XFUNCS_H_ */ diff --git a/proto/x11proto/Xmd.h b/proto/x11proto/Xmd.h index 06fd2bf30..f3868b36d 100644 --- a/proto/x11proto/Xmd.h +++ b/proto/x11proto/Xmd.h @@ -1,5 +1,3 @@ -/* $XdotOrg: proto/X11/Xmd.h,v 1.4 2006/04/20 01:24:25 alanc Exp $ */ -/* $XFree86: xc/include/Xmd.h,v 3.18tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,8 +45,7 @@ SOFTWARE. ******************************************************************/ #ifndef XMD_H -#define XMD_H 1 -/* $Xorg: Xmd.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ +# define XMD_H 1 /* * Xmd.h: MACHINE DEPENDENT DECLARATIONS. */ @@ -56,32 +53,27 @@ SOFTWARE. /* * Special per-machine configuration flags. */ -#if defined(sun) && defined(__SVR4) -# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */ -#endif - -#ifdef CRAY -#define WORD64 /* 64-bit architecture */ -#endif -#if defined (_LP64) || \ - defined(__alpha) || defined(__alpha__) || \ - defined(__ia64__) || defined(ia64) || \ - defined(__sparc64__) || \ - defined(__s390x__) || \ - (defined(__hppa__) && defined(__LP64__)) || \ - defined(__amd64__) || defined(amd64) || \ - defined(__powerpc64__) || \ - (defined(sgi) && (_MIPS_SZLONG == 64)) -#define LONG64 /* 32/64-bit architecture */ -#endif +# if defined(__sun) && defined(__SVR4) +# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */ +# endif + +# if defined (_LP64) || defined(__LP64__) || \ + defined(__alpha) || defined(__alpha__) || \ + defined(__ia64__) || defined(ia64) || \ + defined(__sparc64__) || \ + defined(__s390x__) || \ + defined(__amd64__) || defined(amd64) || \ + defined(__powerpc64__) +# define LONG64 /* 32/64-bit architecture */ +# endif /* * Stuff to handle large architecture machines; the constants were generated * on a 32-bit machine and must correspond to the protocol. */ -#ifdef WORD64 -#define MUSTCOPY -#endif /* WORD64 */ +# ifdef WORD64 +# define MUSTCOPY +# endif /* WORD64 */ /* @@ -95,114 +87,99 @@ SOFTWARE. * symbols are no more than 32 characters long (which causes problems for some * compilers and preprocessors). * - * The extra indirection in the __STDC__ case is to get macro arguments to - * expand correctly before the concatenation, rather than afterward. + * The extra indirection is to get macro arguments to expand correctly before + * the concatenation, rather than afterward. */ -#if ((defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)) && !defined(UNIXCPP)) || defined(ANSICPP) -#define _SIZEOF(x) sz_##x -#define SIZEOF(x) _SIZEOF(x) -#else -#define SIZEOF(x) sz_/**/x -#endif /* if ANSI C compiler else not */ +# define _SIZEOF(x) sz_##x +# define SIZEOF(x) _SIZEOF(x) /* * Bitfield suffixes for the protocol structure elements, if you * need them. Note that bitfields are not guaranteed to be signed * (or even unsigned) according to ANSI C. */ -#ifdef WORD64 +# ifdef WORD64 typedef long INT64; typedef unsigned long CARD64; -#define B32 :32 -#define B16 :16 -#ifdef UNSIGNEDBITFIELDS +# define B32 :32 +# define B16 :16 +# ifdef UNSIGNEDBITFIELDS typedef unsigned int INT32; typedef unsigned int INT16; -#else -#ifdef __STDC__ +# else typedef signed int INT32; typedef signed int INT16; -#else -typedef int INT32; -typedef int INT16; -#endif -#endif -#else -#define B32 -#define B16 -#ifdef LONG64 +# endif +# else +# define B32 +# define B16 +# ifdef LONG64 typedef long INT64; typedef int INT32; -#else +# else typedef long INT32; -#endif +# endif typedef short INT16; -#endif +# endif -#if defined(__STDC__) || defined(sgi) || defined(AIXV3) typedef signed char INT8; -#else -typedef char INT8; -#endif -#ifdef LONG64 +# ifdef LONG64 typedef unsigned long CARD64; typedef unsigned int CARD32; -#else +# else typedef unsigned long CARD32; -#endif +# endif +# if !defined(WORD64) && !defined(LONG64) +typedef unsigned long long CARD64; +# endif typedef unsigned short CARD16; typedef unsigned char CARD8; typedef CARD32 BITS32; typedef CARD16 BITS16; -#ifndef I_NEED_OS2_H typedef CARD8 BYTE; typedef CARD8 BOOL; -#else -#define BYTE CARD8 -#define BOOL CARD8 -#endif /* * definitions for sign-extending bitfields on 64-bit architectures */ -#if defined(WORD64) && defined(UNSIGNEDBITFIELDS) -#define cvtINT8toInt(val) (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val)) -#define cvtINT16toInt(val) (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val)) -#define cvtINT32toInt(val) (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val)) -#define cvtINT8toShort(val) cvtINT8toInt(val) -#define cvtINT16toShort(val) cvtINT16toInt(val) -#define cvtINT32toShort(val) cvtINT32toInt(val) -#define cvtINT8toLong(val) cvtINT8toInt(val) -#define cvtINT16toLong(val) cvtINT16toInt(val) -#define cvtINT32toLong(val) cvtINT32toInt(val) -#else -#define cvtINT8toInt(val) (val) -#define cvtINT16toInt(val) (val) -#define cvtINT32toInt(val) (val) -#define cvtINT8toShort(val) (val) -#define cvtINT16toShort(val) (val) -#define cvtINT32toShort(val) (val) -#define cvtINT8toLong(val) (val) -#define cvtINT16toLong(val) (val) -#define cvtINT32toLong(val) (val) -#endif /* WORD64 and UNSIGNEDBITFIELDS */ - - - -#ifdef MUSTCOPY +# if defined(WORD64) && defined(UNSIGNEDBITFIELDS) +# define cvtINT8toInt(val) (((val) & 0x00000080) ? ((val) | 0xffffffffffffff00) : (val)) +# define cvtINT16toInt(val) (((val) & 0x00008000) ? ((val) | 0xffffffffffff0000) : (val)) +# define cvtINT32toInt(val) (((val) & 0x80000000) ? ((val) | 0xffffffff00000000) : (val)) +# define cvtINT8toShort(val) cvtINT8toInt(val) +# define cvtINT16toShort(val) cvtINT16toInt(val) +# define cvtINT32toShort(val) cvtINT32toInt(val) +# define cvtINT8toLong(val) cvtINT8toInt(val) +# define cvtINT16toLong(val) cvtINT16toInt(val) +# define cvtINT32toLong(val) cvtINT32toInt(val) +# else +# define cvtINT8toInt(val) (val) +# define cvtINT16toInt(val) (val) +# define cvtINT32toInt(val) (val) +# define cvtINT8toShort(val) (val) +# define cvtINT16toShort(val) (val) +# define cvtINT32toShort(val) (val) +# define cvtINT8toLong(val) (val) +# define cvtINT16toLong(val) (val) +# define cvtINT32toLong(val) (val) +# endif /* WORD64 and UNSIGNEDBITFIELDS */ + + + +# ifdef MUSTCOPY /* * This macro must not cast or else pointers will get aligned and be wrong */ -#define NEXTPTR(p,t) (((char *) p) + SIZEOF(t)) -#else /* else not MUSTCOPY, this is used for 32-bit machines */ +# define NEXTPTR(p,t) (((char *) p) + SIZEOF(t)) +# else /* else not MUSTCOPY, this is used for 32-bit machines */ /* * this version should leave result of type (t *), but that should only be * used when not in MUSTCOPY */ -#define NEXTPTR(p,t) (((t *)(p)) + 1) -#endif /* MUSTCOPY - used machines whose C structs don't line up with proto */ +# define NEXTPTR(p,t) (((t *)(p)) + 1) +# endif /* MUSTCOPY - used machines whose C structs don't line up with proto */ #endif /* XMD_H */ diff --git a/proto/x11proto/Xos.h b/proto/x11proto/Xos.h index 67bf67924..646716b4f 100644 --- a/proto/x11proto/Xos.h +++ b/proto/x11proto/Xos.h @@ -1,8 +1,5 @@ /* - * $XdotOrg: proto/X11/Xos.h,v 1.8 2005/11/08 06:33:25 jkj Exp $ - * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ - * - * + * Copyright 1987, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -28,53 +25,26 @@ in this Software without prior written authorization from The Open Group. * The X Window System is a Trademark of The Open Group. * */ -/* $XFree86: xc/include/Xos.h,v 3.41tsi Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "significant" number of source files. */ #ifndef _XOS_H_ -#define _XOS_H_ +# define _XOS_H_ -#include <X11/Xosdefs.h> +# include <X11/Xosdefs.h> /* * Get major data types (esp. caddr_t) */ -#ifdef USG -#ifndef __TYPES__ -#ifdef CRAY -#define word word_t -#endif /* CRAY */ -#include <sys/types.h> /* forgot to protect it... */ -#define __TYPES__ -#endif /* __TYPES__ */ -#else /* USG */ -#if defined(_POSIX_SOURCE) && defined(MOTOROLA) -#undef _POSIX_SOURCE -#include <sys/types.h> -#define _POSIX_SOURCE -#else # include <sys/types.h> -#endif -#endif /* USG */ -#ifndef sgi -#if defined(__SCO__) || defined(__UNIXWARE__) -#include <stdint.h> -#endif -#endif +# if defined(__SCO__) || defined(__UNIXWARE__) +# include <stdint.h> +# endif -#ifdef _SEQUENT_ -/* - * in_systm.h compatibility between SysV and BSD types u_char u_short u_long - * select.h for typedef of args to select, fd_set, may use SVR4 later - */ -#include <netinet/in_systm.h> -#include <sys/select.h> -#endif /* _SEQUENT_ */ /* * Just about everyone needs the strings routines. We provide both forms here, @@ -89,208 +59,90 @@ in this Software without prior written authorization from The Open Group. * which can be really inconvenient. :-( */ -#ifndef X_NOT_STDC_ENV - -#include <string.h> -#if defined(__SCO__) || defined(__UNIXWARE__) -#include <strings.h> -#else -#if (defined(sun) && defined(__SVR4)) -#include <strings.h> -#endif -#ifdef __STDC__ -#ifndef index -#define index(s,c) (strchr((s),(c))) -#endif -#ifndef rindex -#define rindex(s,c) (strrchr((s),(c))) -#endif -#else -#ifndef index -#define index strchr -#endif -#ifndef rindex -#define rindex strrchr -#endif -#endif -#endif - -#else - -#ifdef SYSV -#if defined(clipper) || defined(__clipper__) -#include <malloc.h> -#endif -#include <string.h> -#define index strchr -#define rindex strrchr -#else -#include <strings.h> -#define strchr index -#define strrchr rindex -#endif - -#endif /* X_NOT_STDC_ENV */ - -/* - * strerror() - */ -#if (defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII)) && !defined(__GLIBC__) -#ifndef strerror -extern char *sys_errlist[]; -extern int sys_nerr; -#define strerror(n) \ - (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error") -#endif -#endif +# include <string.h> +# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) +# include <strings.h> +# else +# ifndef index +# define index(s,c) (strchr((s),(c))) +# endif +# ifndef rindex +# define rindex(s,c) (strrchr((s),(c))) +# endif +# endif /* * Get open(2) constants */ -#if defined(X_NOT_POSIX) -#include <fcntl.h> -#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(__i386__) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__) -#include <unistd.h> -#endif -#ifdef WIN32 -#include <X11/Xw32defs.h> -#else -#include <sys/file.h> -#endif -#else /* X_NOT_POSIX */ -#if !defined(_POSIX_SOURCE) && defined(macII) -#define _POSIX_SOURCE -#include <fcntl.h> -#include <unistd.h> -#undef _POSIX_SOURCE -#else -#include <fcntl.h> -#include <unistd.h> -#endif -#endif /* X_NOT_POSIX else */ +# if defined(X_NOT_POSIX) +# include <fcntl.h> +# if defined(USL) || defined(__i386__) && (defined(SYSV) || defined(SVR4)) +# include <unistd.h> +# endif +# ifdef WIN32 +# include <X11/Xw32defs.h> +# else +# include <sys/file.h> +# endif +# else /* X_NOT_POSIX */ +# include <fcntl.h> +# include <unistd.h> +# endif /* X_NOT_POSIX else */ /* * Get struct timeval and struct tm */ -#if defined(SYSV) && !defined(_SEQUENT_) - -#ifndef USL -#include <sys/time.h> -#endif -#include <time.h> -#ifdef CRAY -#undef word -#endif /* CRAY */ -#if defined(USG) && !defined(CRAY) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__) && !defined(clipper) && !defined(__clipper__) -struct timeval { - long tv_sec; - long tv_usec; -}; -#ifndef USL_SHARELIB -struct timezone { - int tz_minuteswest; - int tz_dsttime; -}; -#endif /* USL_SHARELIB */ -#endif /* USG */ - -#ifdef _SEQUENT_ -struct timezone { - int tz_minuteswest; - int tz_dsttime; -}; -#endif /* _SEQUENT_ */ - -#else /* not SYSV */ - -#if defined(_POSIX_SOURCE) && defined(SVR4) +# if defined(_POSIX_SOURCE) && defined(SVR4) /* need to omit _POSIX_SOURCE in order to get what we want in SVR4 */ -#undef _POSIX_SOURCE -#include <sys/time.h> -#define _POSIX_SOURCE -#elif defined(WIN32) -#include <time.h> -#if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL) +# undef _POSIX_SOURCE +# include <sys/time.h> +# define _POSIX_SOURCE +# elif defined(WIN32) +# include <time.h> +# if !defined(_WINSOCKAPI_) && !defined(_WILLWINSOCK_) && !defined(_TIMEVAL_DEFINED) && !defined(_STRUCT_TIMEVAL) struct timeval { long tv_sec; /* seconds */ long tv_usec; /* and microseconds */ }; -#define _TIMEVAL_DEFINED -#endif -#include <sys/timeb.h> -#define gettimeofday(t) \ +# define _TIMEVAL_DEFINED +# endif +# include <sys/timeb.h> +# define gettimeofday(t) \ { \ struct _timeb _gtodtmp; \ _ftime (&_gtodtmp); \ (t)->tv_sec = _gtodtmp.time; \ (t)->tv_usec = _gtodtmp.millitm * 1000; \ } -#elif defined(_SEQUENT_) || defined(Lynx) -#include <time.h> -#elif defined (__QNX__) -typedef unsigned long fd_mask; -/* Make sure we get 256 bit select masks */ -#define FD_SETSIZE 256 -#include <sys/select.h> -#include <sys/time.h> -#include <time.h> -#else -#include <sys/time.h> -#include <time.h> -#endif /* defined(_POSIX_SOURCE) && defined(SVR4) */ - -#endif /* SYSV */ +# else +# include <sys/time.h> +# include <time.h> +# endif /* defined(_POSIX_SOURCE) && defined(SVR4) */ /* define X_GETTIMEOFDAY macro, a portable gettimeofday() */ -#if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */ -#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0) -#else -#if defined(SVR4) || defined(VMS) || defined(WIN32) -#define X_GETTIMEOFDAY(t) gettimeofday(t) -#else -#define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0) -#endif -#endif /* XPG4 else */ - -#ifdef __UNIXOS2__ -typedef unsigned long fd_mask; -#include <limits.h> -#define MAX_PATH _POSIX_PATH_MAX -#endif - -#ifdef __GNU__ -#define PATH_MAX 4096 -#define MAXPATHLEN 4096 -#define OPEN_MAX 256 /* We define a reasonable limit. */ -#endif +# if defined(_XOPEN_XPG4) || defined(_XOPEN_UNIX) /* _XOPEN_UNIX is XPG4.2 */ +# define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0) +# else +# if defined(SVR4) || defined(__SVR4) || defined(WIN32) +# define X_GETTIMEOFDAY(t) gettimeofday(t) +# else +# define X_GETTIMEOFDAY(t) gettimeofday(t, (struct timezone*)0) +# endif +# endif /* XPG4 else */ + + +# ifdef __GNU__ +# define PATH_MAX 4096 +# define MAXPATHLEN 4096 +# define OPEN_MAX 256 /* We define a reasonable limit. */ +# endif /* use POSIX name for signal */ -#if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD) && !defined(ISC) -#define SIGCHLD SIGCLD -#endif - -#ifdef ISC -#include <sys/bsdtypes.h> -#include <sys/limits.h> -#define NGROUPS 16 -#endif - -#if defined(ISC) || defined(__UNIXOS2__) || \ - (defined(__linux__) && !defined(__GLIBC__)) || \ - (defined(__QNX__) && !defined(UNIXCONN)) -/* - * Some OS's may not have this - */ - -#define X_NO_SYS_UN 1 - -struct sockaddr_un { - short sun_family; - char sun_path[108]; -}; -#endif +# if defined(X_NOT_POSIX) && defined(SYSV) && !defined(SIGCHLD) +# define SIGCHLD SIGCLD +# endif -#include <X11/Xarch.h> +# include <X11/Xarch.h> #endif /* _XOS_H_ */ diff --git a/proto/x11proto/Xos_r.h b/proto/x11proto/Xos_r.h index 7ce72ac13..f963b6410 100644 --- a/proto/x11proto/Xos_r.h +++ b/proto/x11proto/Xos_r.h @@ -1,5 +1,3 @@ -/* $Xorg: Xos_r.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ -/* $XdotOrg: proto/X11/Xos_r.h,v 1.5 2005/07/13 07:23:56 keithp Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -23,7 +21,6 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/Xos_r.h,v 1.18tsi Exp $ */ /* * Various and sundry Thread-Safe functions used by X11, Motif, and CDE. @@ -40,13 +37,13 @@ in this Software without prior written authorization from The Open Group. * * If you are on a platform that defines XTHREADS but does not have * MT-safe system API (e.g. UnixWare) you must define _Xos_processLock - * and _Xos_processUnlock macros before including this header. If - * you are on OSF/1 V3.2 and plan to use readdir(), you must also define - * _Xos_isThreadInitialized. For convenience XOS_USE_XLIB_LOCKING or - * XOS_USE_XT_LOCKING may be defined to obtain either Xlib-only or - * Xt-based versions of these macros. These macros won't result in - * truly thread-safe calls, but they are better than nothing. If you - * do not want locking in this situation define XOS_USE_NO_LOCKING. + * and _Xos_processUnlock macros before including this header. + * + * For convenience XOS_USE_XLIB_LOCKING or XOS_USE_XT_LOCKING may be defined + * to obtain either Xlib-only or Xt-based versions of these macros. These + * macros won't result in truly thread-safe calls, but they are better than + * nothing. If you do not want locking in this situation define + * XOS_USE_NO_LOCKING. * * NOTE: On systems lacking appropriate _r functions Gethostbyname(), * Gethostbyaddr(), and Getservbyname() do NOT copy the host or @@ -195,20 +192,11 @@ extern void XtProcessUnlock( * uses the older SVR4 thread-safe functions unless the POSIX ones * are specifically requested. Fix the feature test macro. */ -#if defined(sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \ +#if defined(__sun) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && \ (_POSIX_C_SOURCE - 0 < 199506L) && !defined(_POSIX_PTHREAD_SEMANTICS) # undef _POSIX_THREAD_SAFE_FUNCTIONS #endif -/* - * LynxOS 3.1 defines _POSIX_THREAD_SAFE_FUNCTIONS but - * getpwuid_r has different semantics than defined by POSIX - */ -#if defined(Lynx) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) -# undef _POSIX_THREAD_SAFE_FUNCTIONS -#endif - - /***** <pwd.h> wrappers *****/ /* @@ -331,24 +319,16 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p) (p).pwp ) #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__APPLE__) -/* SVR4 threads, AIX 4.2.0 and earlier and OSF/1 3.2 and earlier pthreads */ # define X_NEEDS_PWPARAMS typedef struct { struct passwd pws; char pwbuf[X_LINE_MAX]; } _Xgetpwparams; -# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) || defined(Lynx) -# ifndef Lynx +# if defined(_POSIX_REENTRANT_FUNCTIONS) || !defined(SVR4) # define _XGetpwuid(u,p) \ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) # define _XGetpwnam(u,p) \ ((getpwnam_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# else /* Lynx */ -# define _XGetpwuid(u,p) \ -((getpwuid_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# define _XGetpwnam(u,p) \ -((getpwnam_r(&(p).pws,(u),(p).pwbuf,sizeof((p).pwbuf)) == -1) ? NULL : &(p).pws) -# endif # else /* SVR4 */ # define _XGetpwuid(u,p) \ ((getpwuid_r((u),&(p).pws,(p).pwbuf,sizeof((p).pwbuf)) == NULL) ? NULL : &(p).pws) @@ -357,12 +337,6 @@ typedef struct { # endif /* SVR4 */ #else /* _POSIX_THREAD_SAFE_FUNCTIONS */ -/* Digital UNIX 4.0, but not (beta) T4.0-1 */ -# if defined(__osf__) -/* OSF/1 V4.0 <pwd.h> doesn't declare the _P routines, breaking under C++. */ -extern int _Pgetpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **); -extern int _Pgetpwnam_r(const char *, struct passwd *, char *, size_t, struct passwd **); -# endif # define X_NEEDS_PWPARAMS typedef struct { struct passwd pws; @@ -427,7 +401,6 @@ typedef int _Xgetservbynameparams; /* dummy */ # define _XGetservbyname(s,p,sp) getservbyname((s),(p)) #elif !defined(XOS_USE_MTSAFE_NETDBAPI) || defined(XNO_MTSAFE_NETDBAPI) -/* UnixWare 2.0, or other systems with thread support but no _r API. */ /* WARNING: The h_addr_list and s_aliases values are *not* copied! */ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) @@ -485,9 +458,6 @@ typedef struct { */ # ifdef _POSIX_REENTRANT_FUNCTIONS # ifndef _POSIX_THREAD_SAFE_FUNCTIONS -# if defined(AIXV3) || defined(AIXV4) || defined(__osf__) -# define X_POSIX_THREAD_SAFE_FUNCTIONS 1 -# endif # endif # endif # ifdef _POSIX_THREAD_SAFE_FUNCTIONS @@ -565,7 +535,7 @@ typedef int _Xgetservbynameparams; /* dummy */ #if defined(X_INCLUDE_DIRENT_H) && !defined(_XOS_INCLUDED_DIRENT_H) # include <sys/types.h> -# if !defined(X_NOT_POSIX) || defined(SYSV) || defined(USG) +# if !defined(X_NOT_POSIX) || defined(SYSV) # include <dirent.h> # else # include <sys/dir.h> @@ -622,32 +592,10 @@ typedef struct { # endif } _Xreaddirparams; -# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(AIXV3) || \ - defined(AIXV4) || defined(__APPLE__) -/* AIX defines the draft POSIX symbol, but uses the final API. */ +# if defined(_POSIX_THREAD_SAFE_FUNCTIONS) || defined(__APPLE__) /* POSIX final API, returns (int)0 on success. */ -# if defined(__osf__) -/* OSF/1 V4.0 <dirent.h> doesn't declare _Preaddir_r, breaking under C++. */ -extern int _Preaddir_r(DIR *, struct dirent *, struct dirent **); -# endif # define _XReaddir(d,p) \ (readdir_r((d), &((p).dir_entry), &((p).result)) ? NULL : (p).result) -# elif defined(_POSIX_REENTRANT_FUNCTIONS) && defined(__osf__) -/* - * OSF/1 V3.2 readdir_r() will SEGV if the main program is not - * explicitly linked with -lc_r. The library REQUIREDLIBS don't help. - * Assume that if threads have been initialized we're linked properly. - */ -# define _XReaddir(d,p) \ - ( (_Xos_isThreadInitialized) ? \ - (readdir_r((d), &((p).dir_entry)) ? NULL : &((p).dir_entry)) : \ - ((_Xos_processLock), \ - (((p).result = readdir((d))) ? \ - (memcpy(&((p).dir_entry), (p).result, (p).result->d_reclen), \ - ((p).result = &(p).dir_entry), 0) : \ - 0), \ - (_Xos_processUnlock), \ - (p).result) ) # elif defined(_POSIX_REENTRANT_FUNCTIONS) /* POSIX draft API, returns (int)0 on success. */ # define _XReaddir(d,p) \ @@ -945,8 +893,8 @@ typedef struct { (_Xos_processUnlock), \ (p).result ) -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(__osf__) || defined(hpV4)) -/* Returns (int)0 on success. OSF/1 v3.2, HP/UX 10 +#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(hpV4) +/* Returns (int)0 on success. * * extern int asctime_r(const struct tm *timeptr, char *buffer, int buflen); * extern int ctime_r(const time_t *timer, char *buffer, int buflen); @@ -967,7 +915,7 @@ typedef struct tm _Xltimeparams; # define _XGmtime(t,p) (gmtime_r((t),&(p)) ? NULL : &(p)) # define _XLocaltime(t,p) (localtime_r((t),&(p)) ? NULL : &(p)) -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(sun) +#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun) /* Returns NULL on failure. Solaris 2.5 * * extern char *asctime_r(const struct tm *tm,char *buf, int buflen); @@ -990,19 +938,12 @@ typedef struct tm _Xltimeparams; # define _XLocaltime(t,p) localtime_r((t),&(p)) #else /* defined(_POSIX_THREAD_SAFE_FUNCTIONS) */ -/* POSIX final API. OSF/1 v4.0, AIX, etc. - * +/* POSIX final API. * extern char *asctime_r(const struct tm *timeptr, char *buffer); * extern char *ctime_r(const time_t *timer, char *buffer); * extern struct tm *gmtime_r(const time_t *timer, struct tm *result); * extern struct tm *localtime_r(const time_t *timer, struct tm *result); */ -# if defined(__osf__) -/* OSF/1 V4.0 <time.h> doesn't declare the _P routines, breaking under C++. */ -extern char *_Pasctime_r(const struct tm *, char *); -extern char *_Pctime_r(const time_t *, char *); -extern struct tm *_Plocaltime_r(const time_t *, struct tm *); -# endif # ifdef TIMELEN typedef char _Xatimeparams[TIMELEN]; typedef char _Xctimeparams[TIMELEN]; @@ -1097,8 +1038,8 @@ typedef struct { (_Xos_processUnlock), \ (p).pgrp ) -#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (defined(sun) || defined(__osf__)) -/* Non-POSIX API. Solaris, DEC v3.2. +#elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(__sun) +/* Non-POSIX API. Solaris. * * extern struct group *getgrgid_r(gid_t, struct group *, char *, int); * extern struct group *getgrnam_r(const char *, struct group *, char *, int); @@ -1111,8 +1052,7 @@ typedef struct { #define _XGetgrnam(n,p) getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf)) #elif !defined(_POSIX_THREAD_SAFE_FUNCTIONS) -/* Non-POSIX API. HP/UX 10, AIX 4. - * +/* Non-POSIX API. * extern int getgrgid_r(gid_t, struct group *, char *, int); * extern int getgrnam_r(const char *, struct group *, char *, int); */ @@ -1126,16 +1066,11 @@ typedef struct { ((getgrnam_r((n), &(p).grp, (p).buf, sizeof((p).buf)) ? NULL : &(p).grp)) #else -/* POSIX final API. DEC v4.0, IRIX 6.2. +/* POSIX final API. * * int getgrgid_r(gid_t, struct group *, char *, size_t, struct group **); * int getgrnam_r(const char *, struct group *, char *, size_t, struct group **); */ -# if defined(__osf__) -/* OSF/1 V4.0 <grp.h> doesn't declare the _P routines, breaking under C++. */ -extern int _Pgetgrgid_r(gid_t, struct group *, char *, size_t, struct group **); -extern int _Pgetgrnam_r(const char *, struct group *, char *, size_t, struct group **); -# endif typedef struct { struct group grp; char buf[X_LINE_MAX]; /* Should be sysconf(_SC_GETGR_R_SIZE_MAX)? */ diff --git a/proto/x11proto/Xosdefs.h b/proto/x11proto/Xosdefs.h index ee33a32f8..33eaee436 100644 --- a/proto/x11proto/Xosdefs.h +++ b/proto/x11proto/Xosdefs.h @@ -1,9 +1,6 @@ /* * O/S-dependent (mis)feature macro definitions * - * $XdotOrg: xc/include/Xosdefs.h,v 1.3 2005/04/28 22:04:12 alanc Exp $ - * $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $ - * Copyright 1991, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -26,151 +23,94 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/Xosdefs.h,v 3.20 2002/05/31 18:45:39 dawes Exp $ */ #ifndef _XOSDEFS_H_ -#define _XOSDEFS_H_ +# define _XOSDEFS_H_ /* - * X_NOT_STDC_ENV means does not have ANSI C header files. Lack of this - * symbol does NOT mean that the system has stdarg.h. - * * X_NOT_POSIX means does not have POSIX header files. Lack of this * symbol does NOT mean that the POSIX environment is the default. * You may still have to define _POSIX_SOURCE to get it. */ -#ifdef NOSTDHDRS -#define X_NOT_POSIX -#define X_NOT_STDC_ENV -#endif - -#ifdef sony -#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) -#define X_NOT_POSIX -#endif -#endif - -#ifdef UTEK -#define X_NOT_POSIX -#define X_NOT_STDC_ENV -#endif - -#ifdef vax -#ifndef ultrix /* assume vanilla BSD */ -#define X_NOT_POSIX -#define X_NOT_STDC_ENV -#endif -#endif - -#ifdef luna -#define X_NOT_POSIX -#define X_NOT_STDC_ENV -#endif - -#ifdef Mips -#define X_NOT_POSIX -#define X_NOT_STDC_ENV -#endif - -#ifdef USL -#ifdef SYSV /* (release 3.2) */ -#define X_NOT_POSIX -#define X_NOT_STDC_ENV -#endif -#endif - -#ifdef _SCO_DS -#ifndef __SCO__ -#define __SCO__ -#endif -#endif - -#ifdef __i386__ -#ifdef SYSV -#if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \ - !defined(__UNIXWARE__) && !defined(sun) -#if !defined(_POSIX_SOURCE) -#define X_NOT_POSIX -#endif -#define X_NOT_STDC_ENV -#endif -#endif -#endif - -#ifdef MOTOROLA -#ifdef SYSV -#define X_NOT_STDC_ENV -#endif -#endif - -#ifdef sun + +# ifdef _SCO_DS +# ifndef __SCO__ +# define __SCO__ +# endif +# endif + +# ifdef __i386__ +# ifdef SYSV +# if !defined(__SCO__) && \ + !defined(__UNIXWARE__) && !defined(__sun) +# if !defined(_POSIX_SOURCE) +# define X_NOT_POSIX +# endif +# endif +# endif +# endif + +# ifdef __sun /* Imake configs define SVR4 on Solaris, but cc & gcc only define __SVR4 * This check allows non-Imake configured programs to build correctly. */ -#if defined(__SVR4) && !defined(SVR4) -#define SVR4 1 -#endif -#ifdef SVR4 +# if defined(__SVR4) && !defined(SVR4) +# define SVR4 1 +# endif +# ifdef SVR4 /* define this to whatever it needs to be */ -#define X_POSIX_C_SOURCE 199300L -#endif -#endif - -#ifdef WIN32 -#ifndef _POSIX_ -#define X_NOT_POSIX -#endif -#endif +# define X_POSIX_C_SOURCE 199300L +# endif +# endif -#if defined(nec_ews_svr2) || defined(SX) || defined(PC_UX) -#define X_NOT_POSIX -#define X_NOT_STDC_ENV -#endif +# ifdef WIN32 +# ifndef _POSIX_ +# define X_NOT_POSIX +# endif +# endif -#ifdef __UNIXOS2__ -#define USGISH -#define NULL_NOT_ZERO -#endif -#ifdef __APPLE__ -#define NULL_NOT_ZERO +# ifdef __APPLE__ +# define NULL_NOT_ZERO /* Defining any of these will sanitize the namespace to JUST want is defined by * that particular standard. If that happens, we don't get some expected * prototypes, typedefs, etc (like fd_mask). We can define _DARWIN_C_SOURCE to * loosen our belts a tad. */ -#if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) -#define _DARWIN_C_SOURCE -#endif - -#endif - -#ifdef __GNU__ -#ifndef PATH_MAX -#define PATH_MAX 4096 -#endif -#ifndef MAXPATHLEN -#define MAXPATHLEN 4096 -#endif -#endif - -#if defined(__SCO__) || defined(__UNIXWARE__) -# ifndef PATH_MAX -# define PATH_MAX 1024 +# if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) +# ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE +# endif +# endif + # endif -# ifndef MAXPATHLEN -# define MAXPATHLEN 1024 + +# ifdef __GNU__ +# ifndef PATH_MAX +# define PATH_MAX 4096 +# endif +# ifndef MAXPATHLEN +# define MAXPATHLEN 4096 +# endif +# endif + +# if defined(__SCO__) || defined(__UNIXWARE__) +# ifndef PATH_MAX +# define PATH_MAX 1024 +# endif +# ifndef MAXPATHLEN +# define MAXPATHLEN 1024 +# endif # endif -#endif -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \ +# if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \ || defined(__APPLE__) || defined(__DragonFly__) -# ifndef CSRG_BASED -# define CSRG_BASED +# ifndef CSRG_BASED +# define CSRG_BASED +# endif # endif -#endif #endif /* _XOSDEFS_H_ */ diff --git a/proto/x11proto/Xpoll.h.in b/proto/x11proto/Xpoll.h.in index 33fdad477..827565809 100644 --- a/proto/x11proto/Xpoll.h.in +++ b/proto/x11proto/Xpoll.h.in @@ -1,5 +1,3 @@ -/* $Xorg: Xpoll.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -49,8 +47,6 @@ from The Open Group. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/include/Xpoll.h,v 3.8 2001/01/17 17:53:11 dawes Exp $ */ - #ifndef _XPOLL_H_ #define _XPOLL_H_ @@ -60,32 +56,7 @@ from The Open Group. #include <X11/Xos.h> -/* Below is the monster branch from hell. Basically, most systems will drop to - * 'the branch below is the fallthrough for halfway modern systems', and include - * <sys/select.h>, so we get the FD_* macros. */ -#if !defined(DGUX) -# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE) -# include <sys/select.h> -# ifdef luna -# include <sysent.h> -# endif -# else /* not SVR4/CRAY/AIXv3 */ -# if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */ -# if !defined(NFDBITS) -# include <sys/select.h> -# endif -# else /* the branch below is the fallthrough for halfway modern systems */ -# ifdef __QNX__ /* Make sure we get 256 bit select masks */ -# define FD_SETSIZE 256 -# endif -# include <sys/select.h> -# endif -# endif -#else /* DGUX -- No sys/select in Intel DG/ux */ -# include <sys/time.h> -# include <sys/types.h> -# include <unistd.h> -#endif +#include <sys/select.h> /* Get the FD_* macros. */ #include <X11/Xmd.h> @@ -114,21 +85,13 @@ typedef long fd_mask; #define howmany(x,y) (((x)+((y)-1))/(y)) #endif -#if defined(BSD) && BSD < 198911 && !defined(luna) +#if defined(BSD) && BSD < 198911 typedef struct fd_set { fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)]; } fd_set; #endif -#ifndef hpux /* and perhaps old BSD ??? */ # define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -#else -# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */ -# define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t) -# else -# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t) -# endif -#endif #define __X_FDS_BITS @USE_FDS_BITS@ diff --git a/proto/x11proto/Xproto.h b/proto/x11proto/Xproto.h index 4ec32b8c7..495d44194 100644 --- a/proto/x11proto/Xproto.h +++ b/proto/x11proto/Xproto.h @@ -1,7 +1,3 @@ -/* - * $Xorg: Xproto.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ - */ - /* Definitions for the X window system used by server and c bindings */ /* diff --git a/proto/x11proto/Xprotostr.h b/proto/x11proto/Xprotostr.h index f343d9849..a9e854d37 100644 --- a/proto/x11proto/Xprotostr.h +++ b/proto/x11proto/Xprotostr.h @@ -1,4 +1,3 @@ -/* $Xorg: Xprotostr.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ #ifndef XPROTOSTRUCTS_H #define XPROTOSTRUCTS_H diff --git a/proto/x11proto/Xthreads.h b/proto/x11proto/Xthreads.h index 54b5440ad..3d4420825 100644 --- a/proto/x11proto/Xthreads.h +++ b/proto/x11proto/Xthreads.h @@ -1,7 +1,5 @@ /* - * $Xorg: Xthreads.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $ * - * Copyright 1993, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -25,80 +23,79 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * * */ -/* $XFree86: Xthreads.h,v 3.10 2001/12/14 19:53:26 dawes Exp $ */ #ifndef _XTHREADS_H_ -#define _XTHREADS_H_ +# define _XTHREADS_H_ /* Redefine these to XtMalloc/XtFree or whatever you want before including * this header file. */ -#ifndef xmalloc -#define xmalloc malloc -#endif -#ifndef xfree -#define xfree free -#endif +# ifndef xmalloc +# define xmalloc malloc +# endif +# ifndef xfree +# define xfree free +# endif -#ifdef CTHREADS -#include <cthreads.h> +# ifdef CTHREADS +# include <cthreads.h> typedef cthread_t xthread_t; typedef struct condition xcondition_rec; typedef struct mutex xmutex_rec; -#define xthread_init() cthread_init() -#define xthread_self cthread_self -#define xthread_fork(func,closure) cthread_fork(func,closure) -#define xthread_yield() cthread_yield() -#define xthread_exit(v) cthread_exit(v) -#define xthread_set_name(t,str) cthread_set_name(t,str) -#define xmutex_init(m) mutex_init(m) -#define xmutex_clear(m) mutex_clear(m) -#define xmutex_lock(m) mutex_lock(m) -#define xmutex_unlock(m) mutex_unlock(m) -#define xmutex_set_name(m,str) mutex_set_name(m,str) -#define xcondition_init(cv) condition_init(cv) -#define xcondition_clear(cv) condition_clear(cv) -#define xcondition_wait(cv,m) condition_wait(cv,m) -#define xcondition_signal(cv) condition_signal(cv) -#define xcondition_broadcast(cv) condition_broadcast(cv) -#define xcondition_set_name(cv,str) condition_set_name(cv,str) -#else /* !CTHREADS */ -#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_) -#include <thread.h> -#include <synch.h> +# define xthread_init() cthread_init() +# define xthread_self cthread_self +# define xthread_fork(func,closure) cthread_fork(func,closure) +# define xthread_yield() cthread_yield() +# define xthread_exit(v) cthread_exit(v) +# define xthread_set_name(t,str) cthread_set_name(t,str) +# define xmutex_init(m) mutex_init(m) +# define xmutex_clear(m) mutex_clear(m) +# define xmutex_lock(m) mutex_lock(m) +# define xmutex_unlock(m) mutex_unlock(m) +# define xmutex_set_name(m,str) mutex_set_name(m,str) +# define xcondition_init(cv) condition_init(cv) +# define xcondition_clear(cv) condition_clear(cv) +# define xcondition_wait(cv,m) condition_wait(cv,m) +# define xcondition_signal(cv) condition_signal(cv) +# define xcondition_broadcast(cv) condition_broadcast(cv) +# define xcondition_set_name(cv,str) condition_set_name(cv,str) +# else /* !CTHREADS */ +# if defined(SVR4) +# include <thread.h> +# include <synch.h> typedef thread_t xthread_t; typedef thread_key_t xthread_key_t; typedef cond_t xcondition_rec; typedef mutex_t xmutex_rec; -#if defined(__UNIXWARE__) +# if defined(__UNIXWARE__) extern xthread_t (*_x11_thr_self)(); -#define xthread_self (_x11_thr_self) -#else -#define xthread_self thr_self -#endif -#define xthread_fork(func,closure) thr_create(NULL,0,func,closure,THR_NEW_LWP|THR_DETACHED,NULL) -#define xthread_yield() thr_yield() -#define xthread_exit(v) thr_exit(v) -#define xthread_key_create(kp,d) thr_keycreate(kp,d) -#ifdef sun -#define xthread_key_delete(k) 0 -#else -#define xthread_key_delete(k) thr_keydelete(k) -#endif -#define xthread_set_specific(k,v) thr_setspecific(k,v) -#define xthread_get_specific(k,vp) thr_getspecific(k,vp) -#define xmutex_init(m) mutex_init(m,USYNC_THREAD,0) -#define xmutex_clear(m) mutex_destroy(m) -#define xmutex_lock(m) mutex_lock(m) -#define xmutex_unlock(m) mutex_unlock(m) -#define xcondition_init(cv) cond_init(cv,USYNC_THREAD,0) -#define xcondition_clear(cv) cond_destroy(cv) -#define xcondition_wait(cv,m) cond_wait(cv,m) -#define xcondition_signal(cv) cond_signal(cv) -#define xcondition_broadcast(cv) cond_broadcast(cv) -#else /* !SVR4 */ -#ifdef WIN32 -#include <X11/Xwindows.h> +# define xthread_self (_x11_thr_self) +# else +# define xthread_self thr_self +# endif +# define xthread_fork(func,closure) thr_create(NULL,0,func,closure,THR_NEW_LWP|THR_DETACHED,NULL) +# define xthread_yield() thr_yield() +# define xthread_exit(v) thr_exit(v) +# define xthread_key_create(kp,d) thr_keycreate(kp,d) +# ifdef __sun +# define xthread_key_delete(k) 0 +# else +# define xthread_key_delete(k) thr_keydelete(k) +# endif +# define xthread_set_specific(k,v) thr_setspecific(k,v) +# define xthread_get_specific(k,vp) thr_getspecific(k,vp) +# define xmutex_init(m) mutex_init(m,USYNC_THREAD,0) +# define xmutex_clear(m) mutex_destroy(m) +# define xmutex_lock(m) mutex_lock(m) +# define xmutex_unlock(m) mutex_unlock(m) +# define xcondition_init(cv) cond_init(cv,USYNC_THREAD,0) +# define xcondition_clear(cv) cond_destroy(cv) +# define xcondition_wait(cv,m) cond_wait(cv,m) +# define xcondition_signal(cv) cond_signal(cv) +# define xcondition_broadcast(cv) cond_broadcast(cv) +# else /* !SVR4 */ +# ifdef WIN32 +# include <X11/Xwindows.h> typedef DWORD xthread_t; typedef DWORD xthread_key_t; struct _xthread_waiter { @@ -110,31 +107,31 @@ typedef struct { struct _xthread_waiter *waiters; } xcondition_rec; typedef CRITICAL_SECTION xmutex_rec; -#define xthread_init() _Xthread_init() -#define xthread_self GetCurrentThreadId -#define xthread_fork(func,closure) { \ +# define xthread_init() _Xthread_init() +# define xthread_self GetCurrentThreadId +# define xthread_fork(func,closure) { \ DWORD _tmptid; \ CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, (LPVOID)closure, 0, \ &_tmptid); \ } -#define xthread_yield() Sleep(0) -#define xthread_exit(v) ExitThread((DWORD)(v)) -#define xthread_key_create(kp,d) *(kp) = TlsAlloc() -#define xthread_key_delete(k) TlsFree(k) -#define xthread_set_specific(k,v) TlsSetValue(k,v) -#define xthread_get_specific(k,vp) TlsGetValue(k) -#define xmutex_init(m) InitializeCriticalSection(m) -#define xmutex_clear(m) DeleteCriticalSection(m) -#define _XMUTEX_NESTS -#define xmutex_lock(m) EnterCriticalSection(m) -#define xmutex_unlock(m) LeaveCriticalSection(m) -#define xcondition_init(cv) { \ +# define xthread_yield() Sleep(0) +# define xthread_exit(v) ExitThread((DWORD)(v)) +# define xthread_key_create(kp,d) *(kp) = TlsAlloc() +# define xthread_key_delete(k) TlsFree(k) +# define xthread_set_specific(k,v) TlsSetValue(k,v) +# define xthread_get_specific(k,vp) TlsGetValue(k) +# define xmutex_init(m) InitializeCriticalSection(m) +# define xmutex_clear(m) DeleteCriticalSection(m) +# define _XMUTEX_NESTS +# define xmutex_lock(m) EnterCriticalSection(m) +# define xmutex_unlock(m) LeaveCriticalSection(m) +# define xcondition_init(cv) { \ InitializeCriticalSection(&(cv)->cs); \ (cv)->waiters = NULL; \ } -#define xcondition_clear(cv) DeleteCriticalSection(&(cv)->cs) +# define xcondition_clear(cv) DeleteCriticalSection(&(cv)->cs) extern struct _xthread_waiter *_Xthread_waiter(); -#define xcondition_wait(cv,m) { \ +# define xcondition_wait(cv,m) { \ struct _xthread_waiter *_tmpthr = _Xthread_waiter(); \ EnterCriticalSection(&(cv)->cs); \ _tmpthr->next = (cv)->waiters; \ @@ -144,7 +141,7 @@ extern struct _xthread_waiter *_Xthread_waiter(); WaitForSingleObject(_tmpthr->sem, INFINITE); \ EnterCriticalSection(m); \ } -#define xcondition_signal(cv) { \ +# define xcondition_signal(cv) { \ EnterCriticalSection(&(cv)->cs); \ if ((cv)->waiters) { \ ReleaseSemaphore((cv)->waiters->sem, 1, NULL); \ @@ -152,7 +149,7 @@ extern struct _xthread_waiter *_Xthread_waiter(); } \ LeaveCriticalSection(&(cv)->cs); \ } -#define xcondition_broadcast(cv) { \ +# define xcondition_broadcast(cv) { \ struct _xthread_waiter *_tmpthr; \ EnterCriticalSection(&(cv)->cs); \ for (_tmpthr = (cv)->waiters; _tmpthr; _tmpthr = _tmpthr->next) \ @@ -160,157 +157,157 @@ extern struct _xthread_waiter *_Xthread_waiter(); (cv)->waiters = NULL; \ LeaveCriticalSection(&(cv)->cs); \ } -#else /* !WIN32 */ -#ifdef USE_TIS_SUPPORT +# else /* !WIN32 */ +# ifdef USE_TIS_SUPPORT /* * TIS support is intended for thread safe libraries. * This should not be used for general client programming. */ -#include <tis.h> +# include <tis.h> typedef pthread_t xthread_t; typedef pthread_key_t xthread_key_t; typedef pthread_cond_t xcondition_rec; typedef pthread_mutex_t xmutex_rec; -#define xthread_self tis_self -#define xthread_fork(func,closure) { pthread_t _tmpxthr; \ +# define xthread_self tis_self +# define xthread_fork(func,closure) { pthread_t _tmpxthr; \ pthread_create(&_tmpxthr,NULL,func,closure); } -#define xthread_yield() pthread_yield_np() -#define xthread_exit(v) pthread_exit(v) -#define xthread_key_create(kp,d) tis_key_create(kp,d) -#define xthread_key_delete(k) tis_key_delete(k) -#define xthread_set_specific(k,v) tis_setspecific(k,v) -#define xthread_get_specific(k,vp) *(vp) = tis_getspecific(k) -#define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#define xmutex_init(m) tis_mutex_init(m) -#define xmutex_clear(m) tis_mutex_destroy(m) -#define xmutex_lock(m) tis_mutex_lock(m) -#define xmutex_unlock(m) tis_mutex_unlock(m) -#define xcondition_init(c) tis_cond_init(c) -#define xcondition_clear(c) tis_cond_destroy(c) -#define xcondition_wait(c,m) tis_cond_wait(c,m) -#define xcondition_signal(c) tis_cond_signal(c) -#define xcondition_broadcast(c) tis_cond_broadcast(c) -#else -#ifdef USE_NBSD_THREADLIB +# define xthread_yield() pthread_yield_np() +# define xthread_exit(v) pthread_exit(v) +# define xthread_key_create(kp,d) tis_key_create(kp,d) +# define xthread_key_delete(k) tis_key_delete(k) +# define xthread_set_specific(k,v) tis_setspecific(k,v) +# define xthread_get_specific(k,vp) *(vp) = tis_getspecific(k) +# define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +# define xmutex_init(m) tis_mutex_init(m) +# define xmutex_clear(m) tis_mutex_destroy(m) +# define xmutex_lock(m) tis_mutex_lock(m) +# define xmutex_unlock(m) tis_mutex_unlock(m) +# define xcondition_init(c) tis_cond_init(c) +# define xcondition_clear(c) tis_cond_destroy(c) +# define xcondition_wait(c,m) tis_cond_wait(c,m) +# define xcondition_signal(c) tis_cond_signal(c) +# define xcondition_broadcast(c) tis_cond_broadcast(c) +# else +# ifdef USE_NBSD_THREADLIB /* * NetBSD threadlib support is intended for thread safe libraries. * This should not be used for general client programming. */ -#include <threadlib.h> +# include <threadlib.h> typedef thr_t xthread_t; typedef thread_key_t xthread_key_t; typedef cond_t xcondition_rec; typedef mutex_t xmutex_rec; -#define xthread_self thr_self -#define xthread_fork(func,closure) { thr_t _tmpxthr; \ +# define xthread_self thr_self +# define xthread_fork(func,closure) { thr_t _tmpxthr; \ /* XXX Create it detached? --thorpej */ \ thr_create(&_tmpxthr,NULL,func,closure); } -#define xthread_yield() thr_yield() -#define xthread_exit(v) thr_exit(v) -#define xthread_key_create(kp,d) thr_keycreate(kp,d) -#define xthread_key_delete(k) thr_keydelete(k) -#define xthread_set_specific(k,v) thr_setspecific(k,v) -#define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k) -#define XMUTEX_INITIALIZER MUTEX_INITIALIZER -#define xmutex_init(m) mutex_init(m, 0) -#define xmutex_clear(m) mutex_destroy(m) -#define xmutex_lock(m) mutex_lock(m) -#define xmutex_unlock(m) mutex_unlock(m) -#define xcondition_init(c) cond_init(c, 0, 0) -#define xcondition_clear(c) cond_destroy(c) -#define xcondition_wait(c,m) cond_wait(c,m) -#define xcondition_signal(c) cond_signal(c) -#define xcondition_broadcast(c) cond_broadcast(c) -#else -#include <pthread.h> +# define xthread_yield() thr_yield() +# define xthread_exit(v) thr_exit(v) +# define xthread_key_create(kp,d) thr_keycreate(kp,d) +# define xthread_key_delete(k) thr_keydelete(k) +# define xthread_set_specific(k,v) thr_setspecific(k,v) +# define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k) +# define XMUTEX_INITIALIZER MUTEX_INITIALIZER +# define xmutex_init(m) mutex_init(m, 0) +# define xmutex_clear(m) mutex_destroy(m) +# define xmutex_lock(m) mutex_lock(m) +# define xmutex_unlock(m) mutex_unlock(m) +# define xcondition_init(c) cond_init(c, 0, 0) +# define xcondition_clear(c) cond_destroy(c) +# define xcondition_wait(c,m) cond_wait(c,m) +# define xcondition_signal(c) cond_signal(c) +# define xcondition_broadcast(c) cond_broadcast(c) +# else +# include <pthread.h> typedef pthread_t xthread_t; typedef pthread_key_t xthread_key_t; typedef pthread_cond_t xcondition_rec; typedef pthread_mutex_t xmutex_rec; -#define xthread_self pthread_self -#define xthread_yield() pthread_yield() -#define xthread_exit(v) pthread_exit(v) -#define xthread_set_specific(k,v) pthread_setspecific(k,v) -#define xmutex_clear(m) pthread_mutex_destroy(m) -#define xmutex_lock(m) pthread_mutex_lock(m) -#define xmutex_unlock(m) pthread_mutex_unlock(m) -#ifndef XPRE_STANDARD_API -#define xthread_key_create(kp,d) pthread_key_create(kp,d) -#define xthread_key_delete(k) pthread_key_delete(k) -#define xthread_get_specific(k,vp) *(vp) = pthread_getspecific(k) -#define xthread_fork(func,closure) { pthread_t _tmpxthr; \ +# define xthread_self pthread_self +# define xthread_yield() pthread_yield() +# define xthread_exit(v) pthread_exit(v) +# define xthread_set_specific(k,v) pthread_setspecific(k,v) +# define xmutex_clear(m) pthread_mutex_destroy(m) +# define xmutex_lock(m) pthread_mutex_lock(m) +# define xmutex_unlock(m) pthread_mutex_unlock(m) +# ifndef XPRE_STANDARD_API +# define xthread_key_create(kp,d) pthread_key_create(kp,d) +# define xthread_key_delete(k) pthread_key_delete(k) +# define xthread_get_specific(k,vp) *(vp) = pthread_getspecific(k) +# define xthread_fork(func,closure) { pthread_t _tmpxthr; \ pthread_create(&_tmpxthr,NULL,func,closure); } -#define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER -#define xmutex_init(m) pthread_mutex_init(m, NULL) -#define xcondition_init(c) pthread_cond_init(c, NULL) -#else /* XPRE_STANDARD_API */ -#define xthread_key_create(kp,d) pthread_keycreate(kp,d) -#define xthread_key_delete(k) 0 -#define xthread_get_specific(k,vp) pthread_getspecific(k,vp) -#define xthread_fork(func,closure) { pthread_t _tmpxthr; \ +# define XMUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +# define xmutex_init(m) pthread_mutex_init(m, NULL) +# define xcondition_init(c) pthread_cond_init(c, NULL) +# else /* XPRE_STANDARD_API */ +# define xthread_key_create(kp,d) pthread_keycreate(kp,d) +# define xthread_key_delete(k) 0 +# define xthread_get_specific(k,vp) pthread_getspecific(k,vp) +# define xthread_fork(func,closure) { pthread_t _tmpxthr; \ pthread_create(&_tmpxthr,pthread_attr_default,func,closure); } -#define xmutex_init(m) pthread_mutex_init(m, pthread_mutexattr_default) -#define xcondition_init(c) pthread_cond_init(c, pthread_condattr_default) -#endif /* XPRE_STANDARD_API */ -#define xcondition_clear(c) pthread_cond_destroy(c) -#define xcondition_wait(c,m) pthread_cond_wait(c,m) -#define xcondition_signal(c) pthread_cond_signal(c) -#define xcondition_broadcast(c) pthread_cond_broadcast(c) -#if defined(_DECTHREADS_) +# define xmutex_init(m) pthread_mutex_init(m, pthread_mutexattr_default) +# define xcondition_init(c) pthread_cond_init(c, pthread_condattr_default) +# endif /* XPRE_STANDARD_API */ +# define xcondition_clear(c) pthread_cond_destroy(c) +# define xcondition_wait(c,m) pthread_cond_wait(c,m) +# define xcondition_signal(c) pthread_cond_signal(c) +# define xcondition_broadcast(c) pthread_cond_broadcast(c) +# if defined(_DECTHREADS_) static xthread_t _X_no_thread_id; -#define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id) -#define xthread_clear_id(id) id = _X_no_thread_id -#define xthread_equal(id1,id2) pthread_equal(id1, id2) -#endif /* _DECTHREADS_ */ -#if defined(__linux__) -#define xthread_have_id(id) !pthread_equal(id, 0) -#define xthread_clear_id(id) id = 0 -#define xthread_equal(id1,id2) pthread_equal(id1, id2) -#endif /* linux */ -#if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM) -#ifdef DEBUG /* too much of a hack to enable normally */ +# define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id) +# define xthread_clear_id(id) id = _X_no_thread_id +# define xthread_equal(id1,id2) pthread_equal(id1, id2) +# endif /* _DECTHREADS_ */ +# if defined(__linux__) +# define xthread_have_id(id) !pthread_equal(id, 0) +# define xthread_clear_id(id) id = 0 +# define xthread_equal(id1,id2) pthread_equal(id1, id2) +# endif /* linux */ +# if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM) +# ifdef DEBUG /* too much of a hack to enable normally */ /* see also cma__obj_set_name() */ -#define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str) -#define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str) -#endif /* DEBUG */ -#endif /* _CMA_VENDOR_ == _CMA__IBM */ -#endif /* USE_NBSD_THREADLIB */ -#endif /* USE_TIS_SUPPORT */ -#endif /* WIN32 */ -#endif /* SVR4 */ -#endif /* CTHREADS */ +# define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str) +# define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str) +# endif /* DEBUG */ +# endif /* _CMA_VENDOR_ == _CMA__IBM */ +# endif /* USE_NBSD_THREADLIB */ +# endif /* USE_TIS_SUPPORT */ +# endif /* WIN32 */ +# endif /* SVR4 */ +# endif /* CTHREADS */ typedef xcondition_rec *xcondition_t; typedef xmutex_rec *xmutex_t; -#ifndef xcondition_malloc -#define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec)) -#endif -#ifndef xcondition_free -#define xcondition_free(c) xfree((char *)c) -#endif -#ifndef xmutex_malloc -#define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec)) -#endif -#ifndef xmutex_free -#define xmutex_free(m) xfree((char *)m) -#endif -#ifndef xthread_have_id -#define xthread_have_id(id) id -#endif -#ifndef xthread_clear_id -#define xthread_clear_id(id) id = 0 -#endif -#ifndef xthread_equal -#define xthread_equal(id1,id2) ((id1) == (id2)) -#endif +# ifndef xcondition_malloc +# define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec)) +# endif +# ifndef xcondition_free +# define xcondition_free(c) xfree((char *)c) +# endif +# ifndef xmutex_malloc +# define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec)) +# endif +# ifndef xmutex_free +# define xmutex_free(m) xfree((char *)m) +# endif +# ifndef xthread_have_id +# define xthread_have_id(id) id +# endif +# ifndef xthread_clear_id +# define xthread_clear_id(id) id = 0 +# endif +# ifndef xthread_equal +# define xthread_equal(id1,id2) ((id1) == (id2)) +# endif /* aids understood by some debuggers */ -#ifndef xthread_set_name -#define xthread_set_name(t,str) -#endif -#ifndef xmutex_set_name -#define xmutex_set_name(m,str) -#endif -#ifndef xcondition_set_name -#define xcondition_set_name(cv,str) -#endif +# ifndef xthread_set_name +# define xthread_set_name(t,str) +# endif +# ifndef xmutex_set_name +# define xmutex_set_name(m,str) +# endif +# ifndef xcondition_set_name +# define xcondition_set_name(cv,str) +# endif #endif /* _XTHREADS_H_ */ diff --git a/proto/x11proto/Xw32defs.h b/proto/x11proto/Xw32defs.h index f65b265bf..b2e4b33ae 100644 --- a/proto/x11proto/Xw32defs.h +++ b/proto/x11proto/Xw32defs.h @@ -1,81 +1,79 @@ -/* $Xorg: Xw32defs.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ - #ifndef _XW32DEFS_H -#define _XW32DEFS_H +# define _XW32DEFS_H -#ifdef __GNUC__ /* mingw is more close to unix than msvc */ -#if !defined(__daddr_t_defined) +# ifdef __GNUC__ /* mingw is more close to unix than msvc */ +# if !defined(__daddr_t_defined) typedef char *caddr_t; -#endif -#define lstat stat +# endif +# define lstat stat -#else +# else typedef char *caddr_t; -#define access _access -#define alloca _alloca -#define chdir _chdir -#define chmod _chmod -#define close _close -#define creat _creat -#define dup _dup -#define dup2 _dup2 -#define environ _environ -#define execl _execl -#define execle _execle -#define execlp _execlp -#define execlpe _execlpe -#define execv _execv -#define execve _execve -#define execvp _execvp -#define execvpe _execvpe -#define fdopen _fdopen -#define fileno _fileno -#define fstat _fstat -#define getcwd _getcwd -#define getpid _getpid -#define hypot _hypot -#define isascii __isascii -#define isatty _isatty -#define lseek _lseek -#define mkdir _mkdir -#define mktemp _mktemp -#define open _open -#define putenv _putenv -#define read _read -#define rmdir _rmdir -#define sleep(x) Sleep((x) * 1000) -#define stat _stat -#define sys_errlist _sys_errlist -#define sys_nerr _sys_nerr -#define umask _umask -#define unlink _unlink -#define write _write -#define random rand -#define srandom srand +# define access _access +# define alloca _alloca +# define chdir _chdir +# define chmod _chmod +# define close _close +# define creat _creat +# define dup _dup +# define dup2 _dup2 +# define environ _environ +# define execl _execl +# define execle _execle +# define execlp _execlp +# define execlpe _execlpe +# define execv _execv +# define execve _execve +# define execvp _execvp +# define execvpe _execvpe +# define fdopen _fdopen +# define fileno _fileno +# define fstat _fstat +# define getcwd _getcwd +# define getpid _getpid +# define hypot _hypot +# define isascii __isascii +# define isatty _isatty +# define lseek _lseek +# define mkdir _mkdir +# define mktemp _mktemp +# define open _open +# define putenv _putenv +# define read _read +# define rmdir _rmdir +# define sleep(x) Sleep((x) * 1000) +# define stat _stat +# define sys_errlist _sys_errlist +# define sys_nerr _sys_nerr +# define umask _umask +# define unlink _unlink +# define write _write +# define random rand +# define srandom srand -#define O_RDONLY _O_RDONLY -#define O_WRONLY _O_WRONLY -#define O_RDWR _O_RDWR -#define O_APPEND _O_APPEND -#define O_CREAT _O_CREAT -#define O_TRUNC _O_TRUNC -#define O_EXCL _O_EXCL -#define O_TEXT _O_TEXT -#define O_BINARY _O_BINARY -#define O_RAW _O_BINARY +# define O_RDONLY _O_RDONLY +# define O_WRONLY _O_WRONLY +# define O_RDWR _O_RDWR +# define O_APPEND _O_APPEND +# define O_CREAT _O_CREAT +# define O_TRUNC _O_TRUNC +# define O_EXCL _O_EXCL +# define O_TEXT _O_TEXT +# define O_BINARY _O_BINARY +# define O_RAW _O_BINARY -#define S_IFMT _S_IFMT -#define S_IFDIR _S_IFDIR -#define S_IFCHR _S_IFCHR -#define S_IFREG _S_IFREG -#define S_IREAD _S_IREAD -#define S_IWRITE _S_IWRITE -#define S_IEXEC _S_IEXEC +# define S_IFMT _S_IFMT +# define S_IFDIR _S_IFDIR +# define S_IFCHR _S_IFCHR +# define S_IFREG _S_IFREG +# define S_IREAD _S_IREAD +# define S_IWRITE _S_IWRITE +# define S_IEXEC _S_IEXEC -#define F_OK 0 -#define X_OK 1 -#define W_OK 2 -#define R_OK 4 -#endif /* __GNUC__ */ +# define F_OK 0 +# define X_OK 1 +# define W_OK 2 +# define R_OK 4 +# endif /* __GNUC__ */ #endif diff --git a/proto/x11proto/Xwindows.h b/proto/x11proto/Xwindows.h index 83649522c..6318155e1 100644 --- a/proto/x11proto/Xwindows.h +++ b/proto/x11proto/Xwindows.h @@ -1,4 +1,3 @@ -/* $Xorg$ */ /* Copyright 1996, 1998 The Open Group @@ -28,18 +27,29 @@ The Open Group. */ /* - * This header file has for sole purpose to allow to include windows.h - * without getting any name conflicts with our code. - * Conflicts come from the fact that including windows.h actually pulls - * in the whole Windows API... + * This header file has the sole purpose of allowing the inclusion of + * windows.h without getting any name conflicts with X headers code, by + * renaming the conflicting definitions from windows.h + * + * Some (non-Microsoft) versions of the Windows API headers actually avoid + * making the conflicting definitions if XFree86Server is defined, so we + * need to remember if that was defined and undefine it during including + * windows.h (so the conflicting definitions get wrapped correctly), and + * then redefine it afterwards... + * + * There doesn't seem to be a good way to wrap the min/max macros from + * windows.h, so we simply avoid defining them completely, allowing any + * pre-existing definition to stand. + * */ #undef _XFree86Server -#ifdef XFree86Server -#define _XFree86Server -#undef XFree86Server +#ifdef XFree86Server +# define _XFree86Server +# undef XFree86Server #endif +#define NOMINMAX #define BOOL wBOOL #define INT32 wINT32 #undef Status @@ -48,6 +58,7 @@ The Open Group. #define BYTE wBYTE #define FreeResource wFreeResource #include <windows.h> +#undef NOMINMAX #undef Status #define Status int #undef BYTE @@ -56,25 +67,25 @@ The Open Group. #undef ATOM #undef FreeResource #undef CreateWindowA -#undef min -#undef max #ifdef RESOURCE_H -#undef RT_FONT -#undef RT_CURSOR -#define RT_FONT ((RESTYPE)4) -#define RT_CURSOR ((RESTYPE)5) +# undef RT_FONT +# undef RT_CURSOR +# define RT_FONT ((RESTYPE)4) +# define RT_CURSOR ((RESTYPE)5) #endif +#ifndef __CYGWIN__ #define sleep(x) Sleep((x) * 1000) +#endif #if defined(WIN32) && (!defined(PATH_MAX) || PATH_MAX < 1024) -#undef PATH_MAX -#define PATH_MAX 1024 +# undef PATH_MAX +# define PATH_MAX 1024 #endif #ifdef _XFree86Server -#define XFree86Server -#undef _XFree86Server +# define XFree86Server +# undef _XFree86Server #endif diff --git a/proto/x11proto/Xwinsock.h b/proto/x11proto/Xwinsock.h index 5cf062fbf..e6ca7b54b 100644 --- a/proto/x11proto/Xwinsock.h +++ b/proto/x11proto/Xwinsock.h @@ -1,4 +1,3 @@ -/* $Xorg: Xwinsock.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -36,8 +35,8 @@ The Open Group. #undef _XFree86Server #ifdef XFree86Server -#define _XFree86Server -#undef XFree86Server +# define _XFree86Server +# undef XFree86Server #endif #define BOOL wBOOL @@ -60,7 +59,7 @@ The Open Group. #undef RT_CURSOR #ifdef _XFree86Server -#define XFree86Server -#undef _XFree86Server +# define XFree86Server +# undef _XFree86Server #endif diff --git a/proto/x11proto/configure.ac b/proto/x11proto/configure.ac index eff39c36d..f45250e0c 100644 --- a/proto/x11proto/configure.ac +++ b/proto/x11proto/configure.ac @@ -1,14 +1,17 @@ -AC_PREREQ([2.57]) -AC_INIT([Xproto], [7.0.15], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_PREREQ([2.60]) +AC_INIT([Xproto], [7.0.17], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_MAINTAINER_MODE + +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS AC_CONFIG_HEADER([do-not-use-config.h]) AC_CONFIG_HEADER([Xfuncproto.h]) -# Require xorg-macros: XORG_CHANGELOG -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) - AC_CANONICAL_HOST m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) @@ -200,8 +203,6 @@ if test "x$WIDEPROTO" = xno; then AC_DEFINE(NARROWPROTO, [], [Narrow prototypes]) fi -XORG_RELEASE_VERSION -XORG_CHANGELOG AC_OUTPUT([Makefile Xpoll.h diff --git a/proto/x11proto/do-not-use-config.h.in b/proto/x11proto/do-not-use-config.h.in index 4c3523491..25b8013a3 100644 --- a/proto/x11proto/do-not-use-config.h.in +++ b/proto/x11proto/do-not-use-config.h.in @@ -57,6 +57,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/proto/x11proto/keysym.h b/proto/x11proto/keysym.h index 785fed32e..641b25bf2 100644 --- a/proto/x11proto/keysym.h +++ b/proto/x11proto/keysym.h @@ -1,5 +1,3 @@ -/* $Xorg: keysym.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/keysym.h,v 1.3 2001/01/17 17:53:12 dawes Exp $ */ /* default keysyms */ #define XK_MISCELLANY @@ -70,6 +67,7 @@ SOFTWARE. #define XK_VIETNAMESE #define XK_CURRENCY #define XK_MATHEMATICAL +#define XK_BRAILLE #include <X11/keysymdef.h> diff --git a/proto/x11proto/keysymdef.h b/proto/x11proto/keysymdef.h index 2da4ec793..ec125a65a 100644 --- a/proto/x11proto/keysymdef.h +++ b/proto/x11proto/keysymdef.h @@ -1,5 +1,3 @@ -/* $Xorg: keysymdef.h,v 1.4 2001/02/09 02:03:23 $ */ - /*********************************************************** Copyright 1987, 1994, 1998 The Open Group @@ -47,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: $ */ /* * The "X11 Window System Protocol" standard defines in Appendix A the |