diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-05-13 22:53:36 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-05-13 22:53:36 +0000 |
| commit | 7eee605e3aeed549d1053325a03027c5e8cbf71b (patch) | |
| tree | 3cea3cc392af388deb1b7ded8b50889008ca2a6f | |
| parent | 6769ccda88caf27d1441d335ef2b318a047a612b (diff) | |
- For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in <X11/...>XORG-6_8_99_7
- For Xcomposite and Xdamage, don't link the build system out of the xc tree
- Link the public X11 headers into their own directory
- Add links to XKeysymDB and XErrorDB
- Add links to all the Xlib man pages
- Add links to the lcUniConv subdirectory
- Conditionally include config.h in Xlib source
486 files changed, 5164 insertions, 9 deletions
diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..d474ecae --- /dev/null +++ b/AUTHORS @@ -0,0 +1,21 @@ +Once upon a midnight hour, long ago, in a galaxy, far, far, away, Xlib +was originally developed by Jim Gettys, of Digital Equipment +Corporation (now part of HP). + +Warren Turkal did the autotooling in October, 2003. + +Individual deveopers include (in no particular order): Sebastien +Marineau, Holger Veit, Bruno Haible, Keith Packard, Bob Scheifler, +Takashi Fujiwara, Kazunori Nishihara, Hideki Hiura, Hiroyuki Miyamoto, +Katsuhisi Yano, Shigeru Yamada, Stephen Gildea, Li Yuhong, Seiji Kuwari. + +This work was supported by many organizations (in no particular +order), including the X Consortium, Digital Equipment Corporation, +Tektronix, The Open Group, OMRON, Wyse Technology, Fujitsu Limited, +Sun Microsystems, Fuji Xerox, Sony Corporation, Toshiba Corporation, +Massachusetts Institute of Technology, Silicon Graphics, the XFree86 +Project, among others. Patches/fixes came from all over. + +No doubt we've missed credits. Please let us know who should be credited. + + diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..75c246bd --- /dev/null +++ b/COPYING @@ -0,0 +1,852 @@ + Licenses + + The XFree86 Project + + January 2002 + +1. XFree86 License + +XFree86 code without an explicit copyright is covered by the following copy- +right/license: + +Copyright (C) 1994-2002 The XFree86 Project, 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 fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice 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, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the XFree86 +Project. + +2. Other Licenses + +Portions of code are covered by the following licenses/copyrights. See indi- +vidual files for the copyright dates. + +2.1 X/MIT Copyrights + +2.1.1 X Consortium + +Copyright (C) <date> X Consortium + +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 fur- +nished to do so, subject to the following conditions: + +The above copyright notice and this permission notice 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, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X +CONSORTIUM 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. + +Except as contained in this notice, the name of the X Consortium 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 X Consortium. + +X Window System is a trademark of X Consortium, Inc. + +2.1.2 The Open Group + +Copyright <date> The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation. + +The above copyright notice and this permission notice 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, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP 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. + +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. + +2.2 Berkeley-based copyrights: + +2.2.1 General + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- +CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- +CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- +ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +2.2.2 UCB/LBL + +Copyright (c) 1993 The Regents of the University of California. All rights +reserved. + +This software was developed by the Computer Systems Engineering group at +Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to +Berkeley. + +All advertising materials mentioning features or use of this software must +display the following acknowledgement: This product includes software devel- +oped by the University of California, Lawrence Berkeley Laboratory. + +Redistribution and use in source and binary forms, with or without modifica- +tion, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: This product includes soft- + ware developed by the University of California, Berkeley and its con- + tributors. + + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS- +CLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +2.3 NVIDIA Corp + +Copyright (c) 1996 NVIDIA, Corp. All rights reserved. + +NOTICE TO USER: The source code is copyrighted under U.S. and international +laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as +design patents pending on the design and interface of the NV chips. Users +and possessors of this source code are hereby granted a nonexclusive, roy- +alty-free copyright and design patent license to use this code in individual +and commercial software. + +Any use of this source code must include, in the user documentation and +internal comments to the code, notices to the end user as follows: + +Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S. +and foreign countries. + +NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE +CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR- +RANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE +FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM- +AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. + +2.4 GLX Public License + +GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License") + +Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby +grants permission to Recipient (defined below), under Recipient's copyrights +in the Original Software (defined below), to use, copy, modify, merge, pub- +lish, distribute, sublicense and/or sell copies of Subject Software (defined +below), and to permit persons to whom the Subject Software is furnished in +accordance with this License to do the same, subject to all of the following +terms and conditions, which Recipient accepts by engaging in any such use, +copying, modifying, merging, publishing, distributing, sublicensing or sell- +ing: + +1. Definitions. + + (a) "Original Software" means source code of computer software code + which is described in Exhibit A as Original Software. + + (b) "Modifications" means any addition to or deletion from the sub- + stance or structure of either the Original Software or any previous + Modifications. When Subject Software is released as a series of + files, a Modification means (i) any addition to or deletion from + the contents of a file containing Original Software or previous + Modifications and (ii) any new file that contains any part of the + Original Code or previous Modifications. + + (c) "Subject Software" means the Original Software or Modifications + or the combination of the Original Software and Modifications, or + portions of any of the foregoing. + + (d) "Recipient" means an individual or a legal entity exercising + rights under, and complying with all of the terms of, this License. + For legal entities, "Recipient" includes any entity which controls, + is controlled by, or is under common control with Recipient. For + purposes of this definition, "control" of an entity means (a) the + power, direct or indirect, to direct or manage such entity, or (b) + ownership of fifty percent (50%) or more of the outstanding shares + or beneficial ownership of such entity. + +2. Redistribution of Source Code Subject to These Terms. Redistributions of +Subject Software in source code form must retain the notice set forth in +Exhibit A, below, in every file. A copy of this License must be included in +any documentation for such Subject Software where the recipients' rights +relating to Subject Software are described. Recipient may distribute the +source code version of Subject Software under a license of Recipient's +choice, which may contain terms different from this License, provided that +(i) Recipient is in compliance with the terms of this License, and (ii) the +license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13 +of this License, which terms may not be modified or superseded by any other +terms of such license. If Recipient distributes the source code version under +a different license Recipient must make it absolutely clear that any terms +which differ from this License are offered by Recipient alone, not by SGI. +Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as +a result of any such terms Recipient offers. + +3. Redistribution in Executable Form. The notice set forth in Exhibit A must +be conspicuously included in any notice in an executable version of Subject +Software, related documentation or collateral in which Recipient describes +the user's rights relating to the Subject Software. Recipient may distribute +the executable version of Subject Software under a license of Recipient's +choice, which may contain terms different from this License, provided that +(i) Recipient is in compliance with the terms of this License, and (ii) the +license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of +this License, which terms may not be modified or superseded by any other +terms of such license. If Recipient distributes the executable version under +a different license Recipient must make it absolutely clear that any terms +which differ from this License are offered by Recipient alone, not by SGI. +Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as +a result of any such terms Recipient offers. + +4. Termination. This License and the rights granted hereunder will terminate +automatically if Recipient fails to comply with terms herein and fails to +cure such breach within 30 days of the breach. Any sublicense to the Subject +Software which is properly granted shall survive any termination of this +License absent termination by the terms of such sublicense. Provisions which, +by their nature, must remain in effect beyond the termination of this License +shall survive. + +5. No Trademark Rights. This License does not grant any rights to use any +trade name, trademark or service mark whatsoever. No trade name, trademark or +service mark of SGI may be used to endorse or promote products derived from +the Subject Software without prior written permission of SGI. + +6. No Other Rights. This License does not grant any rights with respect to +the OpenGL API or to any software or hardware implementation thereof or to +any other software whatsoever, nor shall any other rights or licenses not +expressly granted hereunder arise by implication, estoppel or otherwise with +respect to the Subject Software. Title to and ownership of the Original Soft- +ware at all times remains with SGI. All rights in the Original Software not +expressly granted under this License are reserved. + +7. Compliance with Laws; Non-Infringement. Recipient shall comply with all +applicable laws and regulations in connection with use and distribution of +the Subject Software, including but not limited to, all export and import +control laws and regulations of the U.S. government and other countries. +Recipient may not distribute Subject Software that (i) in any way infringes +(directly or contributorily) the rights (including patent, copyright, trade +secret, trademark or other intellectual property rights of any kind) of any +other person or entity or (ii) breaches any representation or warranty, +express, implied or statutory, which under any applicable law it might be +deemed to have been distributed. + +8. Claims of Infringement. If Recipient at any time has knowledge of any one +or more third party claims that reproduction, modification, use, distribu- +tion, import or sale of Subject Software (including particular functionality +or code incorporated in Subject Software) infringes the third party's intel- +lectual property rights, Recipient must place in a well-identified web page +bearing the title "LEGAL" a description of each such claim and a description +of the party making each such claim in sufficient detail that a user of the +Subject Software will know whom to contact regarding the claim. Also, upon +gaining such knowledge of any such claim, Recipient must conspicuously +include the URL for such web page in the Exhibit A notice required under Sec- +tions 2 and 3, above, and in the text of any related documentation, license +agreement or collateral in which Recipient describes end user's rights relat- +ing to the Subject Software. If Recipient obtains such knowledge after it +makes Subject Software available to any other person or entity, Recipient +shall take other steps (such as notifying appropriate mailing lists or news- +groups) reasonably calculated to inform those who received the Subject Soft- +ware that new knowledge has been obtained. + +9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT +LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- +CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO +RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE +PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- +VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN +ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED +HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE- +ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA- +BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR +ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY +CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK +STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER +COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF +THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY +TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO +THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO +NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, +SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. + +11. Indemnity. Recipient shall be solely responsible for damages arising, +directly or indirectly, out of its utilization of rights under this License. +Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. +from and against any loss, liability, damages, costs or expenses (including +the payment of reasonable attorneys fees) arising out of Recipient's use, +modification, reproduction and distribution of the Subject Software or out of +any representation or warranty made by Recipient. + +12. U.S. Government End Users. The Subject Software is a "commercial item" +consisting of "commercial computer software" as such terms are defined in +title 48 of the Code of Federal Regulations and all U.S. Government End +Users acquire only the rights set forth in this License and are subject to +the terms of this License. + +13. Miscellaneous. This License represents the complete agreement concerning +subject matter hereof. If any provision of this License is held to be unen- +forceable, such provision shall be reformed so as to achieve as nearly as +possible the same economic effect as the original provision and the remainder +of this License will remain in effect. This License shall be governed by and +construed in accordance with the laws of the United States and the State of +California as applied to agreements entered into and to be performed entirely +within California between California residents. Any litigation relating to +this License shall be subject to the exclusive jurisdiction of the Federal +Courts of the Northern District of California (or, absent subject matter +jurisdiction in such courts, the courts of the State of California), with +venue lying exclusively in Santa Clara County, California, with the losing +party responsible for costs, including without limitation, court costs and +reasonable attorneys fees and expenses. The application of the United Nations +Convention on Contracts for the International Sale of Goods is expressly +excluded. Any law or regulation which provides that the language of a con- +tract shall be construed against the drafter shall not apply to this License. + +Exhibit A + +The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and +13 of the GLX Public License Version 1.0 (the "License"). You may not use +this file except in compliance with those sections of the License. You may +obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services, +2011 N. Shoreline Blvd., Mountain View, CA 94043 or at +http://www.sgi.com/software/opensource/glx/license.html. + +Software distributed under the License is distributed on an "AS IS" basis. +ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- +INFRINGEMENT. See the License for the specific language governing rights and +limitations under the License. + +The Original Software is GLX version 1.2 source code, released February, +1999. The developer of the Original Software is Silicon Graphics, Inc. Those +portions of the Subject Software created by Silicon Graphics, Inc. are Copy- +right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. + +2.5 CID Font Code Public License + +CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License") + +Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI") +hereby grants permission to Recipient (defined below), under SGI's copyrights +in the Original Software (defined below), to use, copy, modify, merge, pub- +lish, distribute, sublicense and/or sell copies of Subject Software (defined +below) in both source code and executable form, and to permit persons to whom +the Subject Software is furnished in accordance with this License to do the +same, subject to all of the following terms and conditions, which Recipient +accepts by engaging in any such use, copying, modifying, merging, publica- +tion, distributing, sublicensing or selling: + +1. Definitions. + + a. "Original Software" means source code of computer software code + that is described in Exhibit A as Original Software. + + b. "Modifications" means any addition to or deletion from the sub- + stance or structure of either the Original Software or any previous + Modifications. When Subject Software is released as a series of + files, a Modification means (i) any addition to or deletion from + the contents of a file containing Original Software or previous + Modifications and (ii) any new file that contains any part of the + Original Code or previous Modifications. + + c. "Subject Software" means the Original Software or Modifications + or the combination of the Original Software and Modifications, or + portions of any of the foregoing. + + d. "Recipient" means an individual or a legal entity exercising + rights under the terms of this License. For legal entities, "Recip- + ient" includes any entity that controls, is controlled by, or is + under common control with Recipient. For purposes of this defini- + tion, "control" of an entity means (i) the power, direct or indi- + rect, to direct or manage such entity, or (ii) ownership of fifty + percent (50%) or more of the outstanding shares or beneficial own- + ership of such entity. + + e. "Required Notice" means the notice set forth in Exhibit A to + this License. + + f. "Accompanying Technology" means any software or other technology + that is not a Modification and that is distributed or made publicly + available by Recipient with the Subject Software. Separate soft- + ware files that do not contain any Original Software or any previ- + ous Modification shall not be deemed a Modification, even if such + software files are aggregated as part of a product, or in any + medium of storage, with any file that does contain Original Soft- + ware or any previous Modification. + +2. License Terms. All distribution of the Subject Software must be made sub- +ject to the terms of this License. A copy of this License and the Required +Notice must be included in any documentation for Subject Software where +Recipient's rights relating to Subject Software and/or any Accompanying Tech- +nology are described. Distributions of Subject Software in source code form +must also include the Required Notice in every file distributed. In addition, +a ReadMe file entitled "Important Legal Notice" must be distributed with each +distribution of one or more files that incorporate Subject Software. That +file must be included with distributions made in both source code and exe- +cutable form. A copy of the License and the Required Notice must be included +in that file. Recipient may distribute Accompanying Technology under a +license of Recipient's choice, which may contain terms different from this +License, provided that (i) Recipient is in compliance with the terms of this +License, (ii) such other license terms do not modify or supersede the terms +of this License as applicable to the Subject Software, (iii) Recipient hereby +indemnifies SGI for any liability incurred by SGI as a result of the distri- +bution of Accompanying Technology or the use of other license terms. + +3. Termination. This License and the rights granted hereunder will terminate +automatically if Recipient fails to comply with terms herein and fails to +cure such breach within 30 days of the breach. Any sublicense to the Subject +Software that is properly granted shall survive any termination of this +License absent termination by the terms of such sublicense. Provisions which, +by their nature, must remain in effect beyond the termination of this License +shall survive. + +4. Trademark Rights. This License does not grant any rights to use any trade +name, trademark or service mark whatsoever. No trade name, trademark or ser- +vice mark of SGI may be used to endorse or promote products derived from or +incorporating any Subject Software without prior written permission of SGI. + +5. No Other Rights. No rights or licenses not expressly granted hereunder +shall arise by implication, estoppel or otherwise. Title to and ownership of +the Original Software at all times remains with SGI. All rights in the Origi- +nal Software not expressly granted under this License are reserved. + +6. Compliance with Laws; Non-Infringement. Recipient shall comply with all +applicable laws and regulations in connection with use and distribution of +the Subject Software, including but not limited to, all export and import +control laws and regulations of the U.S. government and other countries. +Recipient may not distribute Subject Software that (i) in any way infringes +(directly or contributorily) the rights (including patent, copyright, trade +secret, trademark or other intellectual property rights of any kind) of any +other person or entity, or (ii) breaches any representation or warranty, +express, implied or statutory, which under any applicable law it might be +deemed to have been distributed. + +7. Claims of Infringement. If Recipient at any time has knowledge of any one +or more third party claims that reproduction, modification, use, distribu- +tion, import or sale of Subject Software (including particular functionality +or code incorporated in Subject Software) infringes the third party's intel- +lectual property rights, Recipient must place in a well-identified web page +bearing the title "LEGAL" a description of each such claim and a description +of the party making each such claim in sufficient detail that a user of the +Subject Software will know whom to contact regarding the claim. Also, upon +gaining such knowledge of any such claim, Recipient must conspicuously +include the URL for such web page in the Required Notice, and in the text of +any related documentation, license agreement or collateral in which Recipient +describes end user's rights relating to the Subject Software. If Recipient +obtains such knowledge after it makes Subject Software available to any other +person or entity, Recipient shall take other steps (such as notifying appro- +priate mailing lists or newsgroups) reasonably calculated to provide such +knowledge to those who received the Subject Software. + +8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, +WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT +LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- +CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO +RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE +PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- +VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN +ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED +HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, +WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), +CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR 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 SUBJECT SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT +ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND +LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED. + +10. Indemnity. Recipient shall be solely responsible for damages arising, +directly or indirectly, out of its utilization of rights under this License. +Recipient will defend, indemnify and hold SGI and its successors and assigns +harmless from and against any loss, liability, damages, costs or expenses +(including the payment of reasonable attorneys fees) arising out of (Recipi- +ent's use, modification, reproduction and distribution of the Subject Soft- +ware or out of any representation or warranty made by Recipient. + +11. U.S. Government End Users. The Subject Software is a "commercial item" +consisting of "commercial computer software" as such terms are defined in +title 48 of the Code of Federal Regulations and all U.S. Government End Users +acquire only the rights set forth in this License and are subject to the +terms of this License. + +12. Miscellaneous. This License represents the complete agreement concerning +subject matter hereof. If any provision of this License is held to be unen- +forceable by any judicial or administrative authority having proper jurisdic- +tion with respect thereto, such provision shall be reformed so as to achieve +as nearly as possible the same economic effect as the original provision and +the remainder of this License will remain in effect. This License shall be +governed by and construed in accordance with the laws of the United States +and the State of California as applied to agreements entered into and to be +performed entirely within California between California residents. Any liti- +gation relating to this License shall be subject to the exclusive jurisdic- +tion of the Federal Courts of the Northern District of California (or, absent +subject matter jurisdiction in such courts, the courts of the State of Cali- +fornia), with venue lying exclusively in Santa Clara County, California, with +the losing party responsible for costs, including without limitation, court +costs and reasonable attorneys fees and expenses. The application of the +United Nations Convention on Contracts for the International Sale of Goods is +expressly excluded. Any law or regulation that provides that the language of +a contract shall be construed against the drafter shall not apply to this +License. + +Exhibit A + +Copyright (c) 1994-1999 Silicon Graphics, Inc. + +The contents of this file are subject to the CID Font Code Public License +Version 1.0 (the "License"). You may not use this file except in compliance +with the License. You may obtain a copy of the License at Silicon Graphics, +Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 +or at http://www.sgi.com/software/opensource/cid/license.html + +Software distributed under the License is distributed on an "AS IS" basis. +ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- +INFRINGEMENT. See the License for the specific language governing rights and +limitations under the License. + +The Original Software (as defined in the License) is CID font code that was +developed by Silicon Graphics, Inc. Those portions of the Subject Software +(as defined in the License) that were created by Silicon Graphics, Inc. are +Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved. + +[NOTE: When using this text in connection with Subject Software delivered +solely in object code form, Recipient may replace the words "this file" with +"this software" in both the first and second sentences.] + +******************************************************************************** + +XFree86's LICENSE document does not appear to be completely +comprehensive. + +Many files appear to be licensed under the "SGI FREE SOFTWARE +LICENSE B (Version 1.1 [02/22/2000])": + +SGI FREE SOFTWARE LICENSE B (Version 1.1 [02/22/2000]) + +1. Definitions. + + 1.1. "Additional Notice Provisions" means such additional provisions as + appear in the Notice in Original Code under the heading "Additional + Notice Provisions." + + 1.2. "Covered Code" means the Original Code or Modifications, or any + combination thereof. + + 1.3. "Hardware" means any physical device that accepts input, processes + input, stores the results of processing, and/or provides output. + + 1.4. "Larger Work" means a work that combines Covered Code or portions + thereof with code not governed by the terms of this License. + + 1.5. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.6. "License" means this document. + + 1.7. "Licensed Patents" means patent claims Licensable by SGI that are + infringed by the use or sale of Original Code or any Modifications + provided by SGI, or any combination thereof. + + 1.8. "Modifications" means any addition to or deletion from the + substance or structure of the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + + A. Any addition to the contents of a file containing Original Code + and/or addition to or deletion from the contents of a file + containing previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.9. "Notice" means any notice in Original Code or Covered Code, as + required by and in compliance with this License. + + 1.10. "Original Code" means source code of computer software code that + is described in the source code Notice required by Exhibit A as + Original Code, and updates and error corrections specifically thereto. + + 1.11. "Recipient" means an individual or a legal entity exercising + rights under, and complying with all of the terms of, this License or a + future version of this License issued under Section 8. For legal + entities, "Recipient" includes any entity that controls, is controlled + by, or is under common control with Recipient. For purposes of this + definition, "control" of an entity means (a) the power, direct or + indirect, to direct or manage such entity, or (b) ownership of fifty + percent (50%) or more of the outstanding shares or beneficial ownership + of such entity. + + 1.12. "Recipient Patents" means patent claims Licensable by a Recipient + that are infringed by the use or sale of Original Code or any + Modifications provided by SGI, or any combination thereof. + + 1.13. "SGI" means Silicon Graphics, Inc. + + 1.14. "SGI Patents" means patent claims Licensable by SGI other than + the Licensed Patents. + +2. License Grant and Restrictions. + + 2.1. SGI License Grant. Subject to the terms of this License and any + third party intellectual property claims, for the duration of + intellectual property protections inherent in the Original Code, SGI + hereby grants Recipient a worldwide, royalty-free, non-exclusive + license, to do the following: (i) under copyrights Licensable by SGI, + to reproduce, distribute, create derivative works from, and, to the + extent applicable, display and perform the Original Code and/or any + Modifications provided by SGI alone and/or as part of a Larger Work; + and (ii) under any Licensable Patents, to make, have made, use, sell, + offer for sale, import and/or otherwise transfer the Original Code + and/or any Modifications provided by SGI. Recipient accepts the terms + and conditions of this License by undertaking any of the aforementioned + actions. The patent license shall apply to the Covered Code if, at the + time any related Modification is added, such addition of the + Modification causes such combination to be covered by the Licensed + Patents. The patent license in Section 2.1(ii) shall not apply to any + other combinations that include the Modification. No patent license is + provided under SGI Patents for infringements of SGI Patents by + Modifications not provided by SGI or combinations of Original Code and + Modifications not provided by SGI. + + 2.2. Recipient License Grant. Subject to the terms of this License and + any third party intellectual property claims, Recipient hereby grants + SGI and any other Recipients a worldwide, royalty-free, non-exclusive + license, under any Recipient Patents, to make, have made, use, sell, + offer for sale, import and/or otherwise transfer the Original Code + and/or any Modifications provided by SGI. + + 2.3. No License For Hardware Implementations. The licenses granted in + Section 2.1 and 2.2 are not applicable to implementation in Hardware of + the algorithms embodied in the Original Code or any Modifications + provided by SGI . + +3. Redistributions. + + 3.1. Retention of Notice/Copy of License. The Notice set forth in + Exhibit A, below, must be conspicuously retained or included in any and + all redistributions of Covered Code. For distributions of the Covered + Code in source code form, the Notice must appear in every file that can + include a text comments field; in executable form, the Notice and a + copy of this License must appear in related documentation or collateral + where the Recipient's rights relating to Covered Code are described. + Any Additional Notice Provisions which actually appears in the Original + Code must also be retained or included in any and all redistributions + of Covered Code. + + 3.2. Alternative License. Provided that Recipient is in compliance with + the terms of this License, Recipient may, so long as without derogation + of any of SGI's rights in and to the Original Code, distribute the + source code and/or executable version(s) of Covered Code under (1) this + License; (2) a license identical to this License but for only such + changes as are necessary in order to clarify Recipient's role as + licensor of Modifications; and/or (3) a license of Recipient's + choosing, containing terms different from this License, provided that + the license terms include this Section 3 and Sections 4, 6, 7, 10, 12, + and 13, which terms may not be modified or superseded by any other + terms of such license. If Recipient elects to use any license other + than this License, Recipient must make it absolutely clear that any of + its terms which differ from this License are offered by Recipient + alone, and not by SGI. It is emphasized that this License is a limited + license, and, regardless of the license form employed by Recipient in + accordance with this Section 3.2, Recipient may relicense only such + rights, in Original Code and Modifications by SGI, as it has actually + been granted by SGI in this License. + + 3.3. Indemnity. Recipient hereby agrees to indemnify SGI for any + liability incurred by SGI as a result of any such alternative license + terms Recipient offers. + +4. Termination. This License and the rights granted hereunder will +terminate automatically if Recipient breaches any term herein and fails to +cure such breach within 30 days thereof. Any sublicense to the Covered Code +that is properly granted shall survive any termination of this License, +absent termination by the terms of such sublicense. Provisions that, by +their nature, must remain in effect beyond the termination of this License, +shall survive. + +5. No Trademark Or Other Rights. This License does not grant any rights to: +(i) any software apart from the Covered Code, nor shall any other rights or +licenses not expressly granted hereunder arise by implication, estoppel or +otherwise with respect to the Covered Code; (ii) any trade name, trademark +or service mark whatsoever, including without limitation any related right +for purposes of endorsement or promotion of products derived from the +Covered Code, without prior written permission of SGI; or (iii) any title +to or ownership of the Original Code, which shall at all times remains with +SGI. All rights in the Original Code not expressly granted under this +License are reserved. + +6. Compliance with Laws; Non-Infringement. There are various worldwide +laws, regulations, and executive orders applicable to dispositions of +Covered Code, including without limitation export, re-export, and import +control laws, regulations, and executive orders, of the U.S. government and +other countries, and Recipient is reminded it is obliged to obey such laws, +regulations, and executive orders. Recipient may not distribute Covered +Code that (i) in any way infringes (directly or contributorily) any +intellectual property rights of any kind of any other person or entity or +(ii) breaches any representation or warranty, express, implied or +statutory, to which, under any applicable law, it might be deemed to have +been subject. + +7. Claims of Infringement. If Recipient learns of any third party claim +that any disposition of Covered Code and/or functionality wholly or +partially infringes the third party's intellectual property rights, +Recipient will promptly notify SGI of such claim. + +8. Versions of the License. SGI may publish revised and/or new versions of +the License from time to time, each with a distinguishing version number. +Once Covered Code has been published under a particular version of the +License, Recipient may, for the duration of the license, continue to use it +under the terms of that version, or choose to use such Covered Code under +the terms of any subsequent version published by SGI. Subject to the +provisions of Sections 3 and 4 of this License, only SGI may modify the +terms applicable to Covered Code created under this License. + +9. DISCLAIMER OF WARRANTY. COVERED CODE IS PROVIDED "AS IS." ALL EXPRESS +AND IMPLIED WARRANTIES AND CONDITIONS ARE DISCLAIMED, INCLUDING, WITHOUT +LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, +SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND +NON-INFRINGEMENT. SGI ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE OF +THE SOFTWARE. SHOULD THE SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, SGI +ASSUMES NO COST OR LIABILITY FOR SERVICING, REPAIR OR CORRECTION. THIS +DISCLAIMER OF WARRANTY IS AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY +COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT SUBJECT TO THIS DISCLAIMER. +10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES NOR LEGAL THEORY, +WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT +LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE +FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF +ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, +WORK STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND +ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN +INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY +SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM +SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL +OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO +RECIPIENT. + +11. Indemnity. Recipient shall be solely responsible for damages arising, +directly or indirectly, out of its utilization of rights under this +License. Recipient will defend, indemnify and hold harmless Silicon +Graphics, Inc. from and against any loss, liability, damages, costs or +expenses (including the payment of reasonable attorneys fees) arising out +of Recipient's use, modification, reproduction and distribution of the +Covered Code or out of any representation or warranty made by Recipient. + +12. U.S. Government End Users. The Covered Code is a "commercial item" +consisting of "commercial computer software" as such terms are defined in +title 48 of the Code of Federal Regulations and all U.S. Government End +Users acquire only the rights set forth in this License and are subject to +the terms of this License. + +13. Miscellaneous. This License represents the complete agreement +concerning the its subject matter. If any provision of this License is held +to be unenforceable, such provision shall be reformed so as to achieve as +nearly as possible the same legal and economic effect as the original +provision and the remainder of this License will remain in effect. This +License shall be governed by and construed in accordance with the laws of +the United States and the State of California as applied to agreements +entered into and to be performed entirely within California between +California residents. Any litigation relating to this License shall be +subject to the exclusive jurisdiction of the Federal Courts of the Northern +District of California (or, absent subject matter jurisdiction in such +courts, the courts of the State of California), with venue lying +exclusively in Santa Clara County, California, with the losing party +responsible for costs, including without limitation, court costs and +reasonable attorneys fees and expenses. The application of the United +Nations Convention on Contracts for the International Sale of Goods is +expressly excluded. Any law or regulation that provides that the language +of a contract shall be construed against the drafter shall not apply to +this License. + +Exhibit A + +License Applicability. Except to the extent portions of this file are made +subject to an alternative license as permitted in the SGI Free Software +License B, Version 1.1 (the "License"), the contents of this file are +subject only to the provisions of the License. You may not use this file +except in compliance with the License. You may obtain a copy of the License +at Silicon Graphics, Inc., attn: Legal Services, 1600 Amphitheatre Parkway, +Mountain View, CA 94043-1351, or at: http://oss.sgi.com/projects/FreeB + +Note that, as provided in the License, the Software is distributed on an +"AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS +DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND +CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A +PARTICULAR PURPOSE, AND NON-INFRINGEMENT. + +Original Code. The Original Code is: [name of software, version number, and +release date], developed by Silicon Graphics, Inc. The Original Code is +Copyright (c) [dates of first publication, as appearing in the Notice in +the Original Code] Silicon Graphics, Inc. Copyright in any portions created +by third parties is as indicated elsewhere herein. All Rights Reserved. +Additional Notice Provisions: [such additional provisions, if any, as +appear in the Notice in the Original Code under the heading "Additional +Notice Provisions"] + +vim:set ai et sw=4 sts=4 tw=72: diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 00000000..ec03d65f --- /dev/null +++ b/ChangeLog @@ -0,0 +1,596 @@ +2005-04-05 Jamey Sharp <jamey@minilop.net> + + * src/OpenDis.c: + * src/locking.c: + * src/locking.h: + * src/xcl/display.c: + * src/xcl/xcblock.c: + When built --with-xcb, quit calling XInitThreads while opening a + display, and just ignore the pluggable InitDisplayLock and + FreeDisplayLock function pointers. Always call the XCB-based + _XInitDisplayLock and _XFreeDisplayLock. + +2005-04-02 Jamey Sharp <jamey@minilop.net> + + * src/xcl/xcblock.c: + Oops. Stop leaking a 4-byte malloc'ed block per request. + +2005-04-01 Jamey Sharp <jamey@minilop.net> + + * src/xcl/xcblock.c: + Set dpy->last_request_read correctly. Fixes a subtle bug for + apps that produce 65,536 requests without getting any responses. + +2005-03-30 Jamey Sharp <jamey@minilop.net> + + * src/xcl/xcblock.c (_XGetXCBBuffer): + Always defer looking for the most recent reply: this prevents + XCB from blocking waiting for a reply that will never come. It + also (together with recent fixes in XCB) makes + XListFontsWithInfo work finally, AFAICT. + +2005-03-24 Owen Taylor <otaylor@redhat.com> + + * x11.pc.in (Cflags): Remove unused references + to XTHREADS_CFLAGS / XTHREADS_LIBS that were breaking + the build of modules depending on X11. + +2005-03-22 Jamey Sharp <jamey@minilop.net> + + * configure.ac: + * src/Makefile.am: + * include/X11/Xlibint.h (removed): + * include/X11/.cvsignore (added): + * include/X11/Xlibint.h.in (added): + Generate Xlibint.h to #define XTHREADS if Xlib was built with + thread support, or to #undef it otherwise. + +2005-03-20 Jamey Sharp <jamey@minilop.net> + + * src/xclint.h: + * src/xcl/display.c: + * src/xcl/io.c: + * src/xcl/xcblock.c: + Instead of registering a callback with XCB for unexpected + replies, just tell XCB to expect replies for all requests that + Xlib sends. Any sequence numbers lower than the last request XCB + has read can be definitively dealt with, either by discovering + that no reply was expected or by handing the reply that arrived + off to the async handlers. + +2005-02-11 Josh Triplett <josh@freedesktop.org> + + * src/xcl/proto.c: Add pregenerated output file based on last + M4-based XCB. + + * configure.ac, src/Makefile.am: Don't try to regenerate the + output file. + + * src/xcl/.cvsignore: Remove; only contained proto.c, which should + now not be ignored. + +2005-02-11 Josh Triplett <josh@freedesktop.org> + + * man/.cvsignore: add man/Makefile.in and man/Makefile. + +2005-02-09 Owen Taylor <otaylor@redhat.com> + + * src/KeyBind.c src/KeysymStr.c src/StrKeysym.c: + Merge changes from head... src/util/makekeys.c + was out of sync with the code that accessed the + generated hash table. + +2005-02-08 Owen Taylor <otaylor@redhat.com> + + * include/X11/Xutil.h: Really restore the + region typedef. + +2005-02-08 Owen Taylor <otaylor@redhat.com> + + * include/X11/region.h include/X11/Xuti.h: Move + the Region typedef back where it belong, don't include + region.h from Xutil.h ... it defines all sorts of + stuff (TRUE/FALSE/MIN/MAXSHORT/Box...) that will + break compilation of projects using Xutil.h. (#2501) + +2005-01-29 Adam Jackson <ajax@freedesktop.org> + + * src/cmsCmap.c: + Remove a bad #include. + +2005-01-29 Adam Jackson <ajax@freedesktop.org> + + * src/ErrDes.c: + * src/imRm.c: + Typo fixes. + +2005-01-29 Adam Jackson <ajax@freedesktop.org> + + * include/X11/region.h: + Reinstate the Region typedef. + * include/X11/Xutil.h: + Include region.h to pick up the Region typedef. + +2005-01-29 Daniel Stone <daniel@freedesktop.org> + + * include/X11/Xutil.h: + * include/X11/Xlib.h: + * include/X11/Xlibint.h: + * src/ConnDis.c (_X11TransConnectDisplay): + * src/ErrDes.c (XGetErrorDatabaseText): + * src/GetWAttrs.c (XGetWindowAttributes): + * src/Host.c: + * src/KeyBind.c (UCSConvertCase) (XConvertCase): + * src/LiHosts.c: + * src/OpenDis.c: + * src/PutBEvent.c (XPutBackEvent): + * src/StrKeysym.c (XStringToKeysym): + * src/XKBBind.c (XkbRefreshKeyboardMapping): + * src/XKBCvt.c: + * src/XlibInt.c: + * src/cmsCmap.c: + * src/cmsColNm.c: + * src/imDefLkup.c (_XimGetWindowEventmask): + * src/imInsClbk.c (_XimUnRegisterIMInstantiateCallback): + * src/imLcFlt.c (_XimLocalFilter): + * src/imLcIm.c (_XimLocalIMFree): + * src/imRm.c: + * src/imThaiFlt.c (tis2ucs): + * src/imTrans.c: + * src/lcEuc.c (euc_ctstowcs) (euc_ctstombs): + * src/lcFile.c: + * src/lcSjis.c: + * src/lcUTF8.c (create_tofontcs_conv): + * src/omGeneric.c (parse_fontdata): + * src/util/makekeys.c (main): + Resync with X.Org HEAD, including a security fix for the error DB name + and a minor stack smash in XKB code, thread-safe XGetWindowAttributes + and XPutBackEvent, case-conversion cleanups and updates, and large-scale + localisation/input cleanups and adherance to the specification. + +2004-11-22 Carl Worth <cworth@cworth.org> + + * configure.ac: Remove AC_CONFIG_AUX_DIR (it was in the wrong + place for automake-1.9, and it was set to the default value + anyway). + +2004-09-30 Jamey Sharp <jamey@minilop.net> + + * src/xcl/io.c: + Update for rename of XCBWaitReply to XCBWaitForReply. + +2004-09-29 Jamey Sharp <jamey@minilop.net> + + * src/xcl/io.c: + Make use of XCBPollForEvent from new XCB API. + +2004-09-29 Jamey Sharp <jamey@minilop.net> + + * src/xcl/xcblock.c: + Keith didn't like my logic, so he fixed it. + +2004-09-29 Jamey Sharp <jamey@minilop.net> + + * src/xcl/io.c: + Include the new xcbext.h header, and make use of new + sanity check macros. + + * src/xcl/xcblock.c: + Make use of new sanity check macros, and don't make + Xlib's idea of the last request read exactly match + XCB's, since it shouldn't. + + * src/xcl/xcbwrap.m4: + Fix handling of LISTPARAMs to match XCB's new + semantics. + +2004-08-02 Jamey Sharp <jamey@minilop.net> + + * src/xcl/display.c: + Update for XCB API as of 2004-07-25. + +2004-08-02 Jamey Sharp <jamey@minilop.net> + + * src/xcl/io.c: (_XSetLastRequestRead) + Added a comment to explain why sequence numbers should go + backwards here. It was really confusing otherwise. + +2004-07-13 Carlos Romero <kidcrash@freedesktop.org> + + * man/Makefile.am: + Include man pages in EXTRA_DIST. + +2004-07-10 Daniel Stone <daniel@freedesktop.org> + + * src/Makefile.am: + Force definition of _BSD_SOURCE, so ConnDis.c can compile. + +2004-07-03 Jamey Sharp <jamey@minilop.net> + + * src/xcl/proto.m4: (GrabButton) + Somehow I got the modifiers and button parameters swapped. It + makes a big difference. + +2004-07-03 Jamey Sharp <jamey@minilop.net> + + * src/xcl/display.c: + Small XCB API change for C++ compatibility. + +2004-07-03 Jamey Sharp <jamey@minilop.net> + + * src/xcl/xcblock.c: + When built with XCB, force a response from the server if we + haven't seen one in 65530 requests. If you don't do this, XCB + gets confused the next time it waits for a reply. + +2004-07-01 Daniel Stone <daniel@freedesktop.org> + + * configure.ac: + * Makefile.am: + * man/*: + Imported man pages from X11R6.7. + +2004-06-29 Daniel Stone <daniel@freedesktop.org> + + * src/x11_trans.h: + Change #include <Xtrans.h> to <X11/Xtrans/Xtrans.h>. + + * src/ClDisplay.c: + * src/OpenDis.c: + * src/XlibInt.c: + Change #if !USE_XCB/#else/#endif to a far more natural #if + USE_XCB/#else/#endif. + +2004-06-28 Daniel Stone <daniel@freedesktop.org> + + * src/ConnDis.c: + * src/CrGlCur.c: + * src/GetDflt.c: + * src/ICWrap.c + * src/Host.c: + * src/LiHosts.c: + * src/OpenDis.c: + * src/SetLocale.c: + * src/Xrm.c: + * src/imThaiFlt.c: + * src/lcUTF8.c: + * src/locking.c: + * src/XlcPubI.h: + * include/X11/Xlib.h: + * include/X11/Xlibint.h: + The great X11R6.7 merge; picking up all changes since 2003-10-01 or + such from the X.Org tree. Unfortunately log information has been lost, + and you'll have to get it from the X.Org tree. CVS sucks, news at 11. + +2004-06-26 Keith Packard <keithp@keithp.com> + + * src/OpenDis.c: (XOpenDisplay): + HACK - set XLIB_SKIP_EXTRA_VISUALS so that you can + hide Composite visuals from applications + +2004-06-16 Jamey Sharp <jamey@minilop.net> + + * src/xclint.h: + * src/xcl/xcblock.c: + Added conditional variants of _X{Get,Put}XCBBuffer, called + _X{Get,Put}XCBBufferIf. Xlib must neither get nor release XCB's + buffer twice in a row; now the code counts to determine whether + the buffer should be owned. This fixes applications that use + XLockDisplay and XUnlockDisplay, like xine. New rule: No XCB + functions can be called by the application between calls to + XLockDisplay and XUnlockDisplay. + + * src/xcl/display.c: (_XAsyncReplyHandler) + Only acquire buffer if we don't already own it. + + * src/xcl/io.c: (_XReply) + Unconditionally release and re-acquire buffer. + + * src/xcl/xcbwrap.m4: + For all generated functions, release and re-acquire buffer + around calls down to XCB if we own the buffer. + +2004-06-16 Keith Packard <keithp@keithp.com> + + * include/X11/Xlibint.h: + Add back xcl private data pointer when compiled to use XCB + * src/xcl/display.c: (init_depths), (init_screens): + Add Composite-specific hack to make Composite visuals invisible + when XLIB_SKIP_EXTRA_VISUALS is set. + * src/xcl/io.c: (_XEventsQueued), (_XReadEvents): + Use _XSend instead of _XFlush to avoid moving events from + XCB to Xlib unexpectedly. This bug would cause Xlib apps to + hang waiting for events that were never going to arrive. + +2004-06-16 Jamey Sharp <jamey@minilop.net> + + * src/Makefile.am: + * src/ChAccCon.c: + * src/ChSaveSet.c: + * src/FSSaver.c: + * src/SetPntMap.c: + I removed too many native Xlib functions when adding proto.m4. + So this puts those excess functions back. + + * src/XlibInt.c: + * src/xcl/io.c: + Hooked up internal connections support that broke when I took + out the old xtrans-based bits. + + * src/xcl/display.c: + Remove redundant creation of default GCs. OpenDis.c still + contains appropriate code to do this. + +2004-06-03 Philip Blundell <philb@gnu.org> + + * configure.ac: New options --disable-unix-transport, + --disable-tcp-transport, --disable-ipv6. + (UNIXCONN, TCPCONN, IPV6CONN): AC_DEFINE as appropriate. + +2004-05-06 Eric Anholt <anholt@FreeBSD.org> + + * src/Makefile.am: + Mark xcl/proto.c nodist (generated file). + +2004-04-14 Warren Turkal <wt@midsouth.rr.com> + + * resync rest public headers with Xorg 6.7 + * resync cms changes with Xorg 6.7 + +2004-04-14 Warren Turkal <wt@midsouth.rr.com> + + * resync most public headers with Xorg 6.7 + +2004-04-13 Warren Turkal <wt@midsouth.rr.com> + + * stop polluting the public API with ImUtil.h + +2004-04-07 Matthew Allum <mallum@handhelds.org> + + * src/X18NCMSstubs.c: (XwcTextExtents), (XwcDrawString), + (XwcDrawText), (XwcDrawImageString), (XwcTextEscapement), + (XwcTextPerCharExtents), (XwcTextPropertyToTextList), + (XwcTextListToTextProperty), (XwcFreeStringList), (XmbTextExtents), + (XmbDrawText), (XmbDrawString), (XmbDrawImageString), + (XmbTextEscapement), (XmbTextPerCharExtents): + Lots more stubs added, all Xmb* and Xwc* should be covered. + +2004-04-05 Warren Turkal <wt@midsouth.rr.com> + + * put the single function prototype in Cmap.h into Xcmsint.h + +2004-03-16 Jamey Sharp <jamey@minilop.net> + + * src/xclint.h: + * include/Makefile.am: + * include/X11/xcl.h (new): + All XCB symbols have names distinct from the names found in Xlib + now, which affects pretty much everything in this update. Also, + now there's an xcl.h that apps can include to get access to the + XCBConnection underlying an XCL Display. + + * src/OpenDis.c: + * src/XlibInt.c: + * src/locking.c: + * src/locking.h: + * src/xcl/display.c: + * src/xcl/io.c: + * src/xcl/xcblock.c (new): + XOpenDisplay calls XInitThreads, so LockDisplay and + UnlockDisplay are called whether a thread library is linked in + or not. Those functions pass control over XCB's data structures + back and forth between XCB and Xlib, so it should be possible to + mix XCB and Xlib calls. + + * configure.ac: + * src/Makefile.am: + * src/xcl/xcbwrap.m4 (new): + * src/xcl/proto.m4 (new): + * src/xcl/.cvsignore (new): + I copied (without history, because I don't care) the + machine-generated bits of the original XCL. When compiled with + XCB, Xlib no longer compiles a bunch of the native Xlib stubs; + it uses stubs that delegate to XCB instead. This tests that Xlib + and XCB calls can mix, without having to rewrite any apps. + +2004-03-07 Warren Turkal <wt@midsouth.rr.com> + + * fix some #endif comments + * point contact email to xlibs@freedesktop.org in configure.ac + +2004-03-06 Jamey Sharp <jamey@minilop.net> + + * src/xcl/display.c: + * src/xcl/io.c: + Updated for XCB API renaming. This code works (more or less) + with the current version of XCB from CVS. + +2004-02-29 Warren Turkal <wt@midsouth.rr.com> + + * Remove all ^L from source + +2004-02-06 Keith Packard <keithp@keithp.com> + + * configure.ac: + Remove quotes from keysymdef.h path search (Alan Cox) + +2004-02-06 Noah Levitt <nlevitt@columbia.edu> + + * configure.ac: Look for keysymdef.h under /usr/include too. Other + fixes and improvements to the search for keysymdef.h. + +2004-01-15 Daniel Stone <daniel@fooishbar.org> + * Tagging release 6.2.1 for the first fd.o clientside lib release. + +2004-01-15 Harold L Hunt II <huntharo@msu.edu> + * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. + +2003-12-04 Matthew Allum <mallum@openedhand.com> + + * src/X18NCMSstubs.c: + Yet more stubs added. + +2003-11-28 Jamey Sharp <jamey@minilop.net> + + * configure.ac: + * include/X11/Xlibint.h: + * src/ClDisplay.c: + * src/Makefile.am: + * src/OpenDis.c: + * src/Xintconn.h: + * src/XlibInt.c: + * src/xclint.h (new): + * src/xcl/display.c (new): + * src/xcl/io.c (new): + A better-tested version of XCL is now available as a + configure-time option. Unlike the version that was on the XCL + branch, this removes no code from CVS; but when --with-xcb is + given to configure, the old code is simply not compiled. The new + code is isolated in the xcl subdirectory. + + Note that this version of XCL requires the XCB version with the + pre_sendrequest tag. Versions newer than that have API changes + that XCL needs to track, but I wanted to commit the conditional + compile patches first. + + Note that XCL removes libXdmcp, which kdm on Debian - at + least - assumes is linked into Xlib. I worked around this with + the obvious LD_PRELOAD. + +2003-11-13 Matthew Allum <mallum@openedhand.com> + + * src/X18NCMSstubs.c: + Extra stubs for _XlcCurrentLC, _XimGetLocaleCode. see bug #143 + +2003-11-13 Jamey Sharp <jamey@minilop.net> + + * configure.ac: + Fix path for finding keysymdef.h. + +2003-11-09 Eric Anholt <anholt@FreeBSD.org> + + * configure.ac: + Make initial package version 6.2.1, as agreed on the mailing list. + +2003-11-09 Luciano Montanaro <mikelima@virgilio.it> + + * configure.ac: + Without the following patch, the xtrans include directory is not + added to the compiler command line, since then the X11_CFLAGS are + not changed in the generated configure script. + +2003-10-31 Eric Anholt <anholt@FreeBSD.org> + + * configure.ac: + * src/XlibInt.c: + * src/x11_trans.c: + Define USE_POLL if the poll() function is available. This + causes poll() to be used instead of select(), which is + supposed to be more efficient. + +2003-10-31 Eric Anholt <anholt@FreeBSD.org> + + reviewed by: <keithp@keithp.com> + + * src/ErrDes.c: + * src/Makefile.am: + * src/XKBCvt.c: + * src/cmsColNm.c: + * src/lcDynamic.c: + * src/lcFile.c: + Look for files in X11_DATADIR instead of /usr/lib/X11. Also, + install XErrorDB in X11_DATADIR. + +2003-10-31 Keith Packard <keithp@keithp.com> + + * configure.ac: + * src/Makefile.am: + Must put -DX11_DATADIR="path" on compile command line because + configure can't manage to get it put into config.h correctly + Distribute XKeysymDB in packages. + +2003-10-29 Eric Anholt <anholt@FreeBSD.org> + + reviewed by: <keithp@keithp.com> + + * configure.ac: + * src/Makefile.am: + Check for XdmcpWrap in libXdmcp, and enable XDM-AUTHORIZATION-1 + support if available. Causes libX11 to be linked against + libXdmcp in that case. + +2003-10-29 Keith Packard <keithp@keithp.com> + + * src/Makefile.am: + Fix 'make dist' to include XKeysymDB + +2003-10-29 Keith Packard <keithp@keithp.com> + + * configure.ac: + * src/Makefile.am: + * src/StrKeysym.c: + Forgot to install XKeysymDB. Installing in ${prefix}/share/X11 + +2003-10-29 Keith Packard <keithp@keithp.com> + + reviewed by: jim.gettys@hp.com, otaylor@redhat.com + + * src/XlibInt.c: (_XReadPad): + Ok, so the XFree86 patch contained a bug fix for a real problem + in this function, but the twisty nature of that fix obscured both + the original bug and the repair (at least to me). Added a nice + comment marking the problem and made nicer looking code to fix it + to boot. + +2003-10-28 Keith Packard <keithp@keithp.com> + + * configure.ac: + * src/Makefile.am: + Add GCC warnings. + Switch from libX11_la_CFLAGS to AM_CFLAGS as that avoids + mass confusion in library object names. + +2003-10-26 Keith Packard <keithp@keithp.com> + + * src/ClDisplay.c: + * src/ConnDis.c: + * src/Makefile.am: + * src/OpenDis.c: + * src/XlibInt.c: + * src/imTrans.c: + oops. ximtrans and XimTrans conflict badly on Windows. + Can't fix this by any method other than renaming the ,v files, + so you won't see that change listed here. We love CVS. + +2003-10-24 Mathew Allum <mallum@openedhand.com> + * added 3 new stubs to X18NCMSstubs.c, needed by Xt apps + +2003-10-19 Mathew Allum <mallum@openedhand.com> + * added xkb disable swtich (experimental) + +2003-10-17 Keith Packard <keithp@keithp.com> + * include/X11/Xcms.h + * src/CvCols.c and various conversion files + Back out bogus typechecking fix for color conversion functions. + Place casts for device-dependent color conversion functions to + avoid warnings. The Xlib specification is inherently type-unsafe. + +2003-10-17 Keith Packard <keithp@keithp.com> + * src/XlibInt.c + Back out incorrect changes from 3.34 to 3.35 that + attempted to fix type incompatibilities with _XAsyncReply. + Change argument type to _XAsyncReply + +2003-10-16 Mathew Allum <mallum@openedhand.com> + * Makefile.am, configure.ac, src/Font.c, src/Xrm.c, src/locking.c + * added X18NCMSstubs.c + experimental patches to build much smaller version of Xlib. + +2003-10-10 Jim Gettys <Jim.Gettys@hp.com> + * updated AUTHORS file + * updated TODO file + * updated README + * put something in the ChangeLog + +2003-10-1 Warren Turkal <wt@midsouth.rr.com> + * Autotooled Xlib diff --git a/INSTALL b/INSTALL new file mode 100644 index 00000000..54caf7c1 --- /dev/null +++ b/INSTALL @@ -0,0 +1,229 @@ +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + These are generic installation instructions. + + 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 only 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. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. 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. + +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=c89 CFLAGS=-O2 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 must use a version of `make' that +supports the `VPATH' variable, such as 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 `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have 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. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' 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. + +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 `--target=TYPE' option 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 + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--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. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..e892e621 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,6 @@ +SUBDIRS=include src nls man + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = x11.pc + +EXTRA_DIST=x11.pc.in @@ -0,0 +1,2 @@ +Xlib is autotooled! + @@ -0,0 +1,40 @@ +#define S(x, y) y##x + +Please contact S(south.rr.com, wt@mid, and jim.gettys@hp.com) before doing +any commits on this module. + +This is the libX11 from XFree86. + +The goal of this project are (1) to get libX11 out of the huge +XF86 hunk of code, (2) to make it buildable with autotools, and +(3) keep the ability to easily merge bug fixes from libX11 in +XF86 into this code, (4) make it possible for people to work with +Xlib without having to deal with the entire XFree86 distribution, +so that bugs can get detected and fixed, (5) provide a place to +move the X library forward. + +1 and 2 are related in that a new build system will need to be +developed to get libX11 building outside of the XF86 tree. +Autotools was chosen for a variety of reasons, not the least +of which was that it is very common in the open source community. + +For 3, notice that the directory structure of the src subdirectory +is congruant to the directory structure of xc/lib/X11 in the +XFree86 tree. Absolutely, do not break this unless this becomes +the dominant libX11. This allows easier incorporation of patches +from the XFree86 libX11. + +For 4, notice that the library can be built without having to build +everything else, so you can build and test enhancements without +replacing your entire X distribution. + +For 5, see the xlibs@pdx.freedesktop.org mailing list. For example, +lots of "stuff" was pushed into Xlib that should have been stand-alone +libraries, since they are not of universal interest and touch the X +wire protocol. (Mea culpa; a mistake I made 15 years ago that didn't +matter much in the days before shared libraries has been amplified for +aeons- jg). And Xlib does not tolerate loss of its connection well, +and so on... + +Thanks for checking this package out, Warren Turkal and Jim Gettys. + diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 00000000..904cd674 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..88feb01c --- /dev/null +++ b/configure.ac @@ -0,0 +1,262 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.57) +AC_INIT([libX11], + 6.2.1, + [xlibs@freedesktop.org], + libX11) +AC_CONFIG_SRCDIR([Makefile.am]) +AM_INIT_AUTOMAKE([dist-bzip2]) + +AM_MAINTAINER_MODE + +AM_CONFIG_HEADER([src/config.h]) + +# Checks for programs. +AC_PROG_LIBTOOL +AC_PROG_CC + +# Checks for pkg-config packages +PKG_CHECK_MODULES(BIGREQS, bigreqsproto) +AC_SUBST(BIGREQS_CFLAGS) +AC_SUBST(BIGREQS_LIBS) + +PKG_CHECK_MODULES(X11, xextensions xtrans xau) +PKG_CHECK_MODULES(XDMCP, xdmcp, [xdmauth="yes"], [xdmauth="no"]) + +AC_SUBST(X11_CFLAGS) +AC_SUBST(X11_LIBS) +AC_SUBST(XDMCP_CFLAGS) +AC_SUBST(XDMCP_LIBS) + +# Transport selection +AC_ARG_ENABLE(unix-transport,[ --disable-unix-transport ], [UNIXCONN=$enableval], [UNIXCONN=yes]) +AC_ARG_ENABLE(tcp-transport, [ --disable-tcp-transport ], [TCPCONN=$enableval], [TCPCONN=yes]) +AC_ARG_ENABLE(ipv6, [ --disable-ipv6 ], [IPV6CONN=$enableval], [IPV6CONN=yes]) +if test "$UNIXCONN" = "yes"; then + AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections]) +fi +if test "$TCPCONN" = "yes"; then + AC_DEFINE(TCPCONN,1,[Support TCP socket connections]) +fi +if test "$IPV6CONN" = "yes"; then + AC_DEFINE(IPv6,1,[Support IPv6 for TCP connections]) +fi + +# Check for dlopen +AC_SEARCH_LIBS(dlopen,[dl svld]) +if test x$ac_cv_search_dlopen = xno; then + AC_SEARCH_LIBS(shl_load,[dld]) + if test x$ac_cv_search_shl_load != xno; then + AC_DEFINE(HAVE_SHL_LOAD,1, + [Use shl_load to load shared libraries]) + AC_CHECK_HEADERS([dl.h]) + fi +else + AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries]) + AC_CHECK_HEADERS([dlfcn.h]) +fi +if test x$ac_cv_header_dlcfn_h -o x$ac_cv_header_dl_h; then + AC_DEFINE(USE_DYNAMIC_XCURSOR,1, + [Use the X cursor library to load cursors]) +fi + +# Checks for header files. +AC_HEADER_STDC +dnl AC_CHECK_HEADERS([stdio.h stdlib.h math.h]) + +# Checks for typedefs, structures, and compiler characteristics. + +# Checks for library functions. +AC_CHECK_FUNCS([strtol]) + +# Checks for system services +dnl AC_PATH_XTRA + +# arch specific things +case $target_alias in + *os2*) os2="true" ;; + *) ;; +esac + +AM_CONDITIONAL(OS2, test x$os2 = xtrue) + +AC_ARG_ENABLE(xthreads, + AC_HELP_STRING([--disable-xthreads], + [Disable Xlib support for Multithreading]), + [xthreads=$enableval],[xthreads=yes]) + +case x$xthreads in +xyes) + AC_DEFINE(XTHREADS,[],[Whether libX11 is compiled with thread support]) + AC_DEFINE(XUSE_MTSAFE_API,[],[Whether libX11 needs to use MT safe API's]) + ;; +*) + ;; +esac +AC_SUBST(XTHREADS) +AC_SUBST(XUSE_MTSAFE_API) + +if test "x$xdmauth" = "xyes"; then +echo checking dmcp +AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS]) +fi + +case x$xdmauth in +xyes) + echo setting flags + XDMCP_CFLAGS="$XDMCP_CFLAGS -DHASXDMAUTH" + ;; +xno) + echo unsetting flags + XDMCP_CFLAGS="" + XDMCP_LIBS="" + ;; +esac +AC_SUBST(XDMCP_CFLAGS) +AC_SUBST(XDMCP_LIBS) + +AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + +# +# Find keysymdef.h +# +KEYSYMDEF="" +AC_MSG_CHECKING([keysymdef.h]) +for flag in $XPROTO_CFLAGS -I/usr/include; do + case "$KEYSYMDEF" in + "") + case "$flag" in + *-I*) + dir=`echo "$flag" | sed 's/ *-I//'` + file="$dir/X11/keysymdef.h" + if test -f "$file"; then + KEYSYMDEF="$file" + fi + ;; + esac + ;; + esac +done +case "$KEYSYMDEF" in +"") + AC_MSG_ERROR([Cannot find keysymdef.h]) + ;; +*) + AC_MSG_RESULT([$KEYSYMDEF]) + ;; +esac +AC_SUBST(KEYSYMDEF) + +AM_CONDITIONAL(UDC, test xfalse = xtrue) +AM_CONDITIONAL(XCMS, test xtrue = xtrue) + +AC_ARG_ENABLE(xcms, + AC_HELP_STRING([--disable-xcms], + [Disable Xlib support for CMS *EXPERIMENTAL*]), + [XCMS=$enableval],[XCMS=yes]) + +AC_ARG_ENABLE(xlocale, + AC_HELP_STRING([--disable-xlocale], + [Disable Xlib locale implementation *EXPERIMENTAL*]), + [XLOCALE=$enableval],[XLOCALE=yes]) + +AC_ARG_ENABLE(xkb, + AC_HELP_STRING([--disable-xkb], + [Disable XKB support *EXPERIMENTAL*]), + [XKB=$enableval],[XKB=yes]) + +# Finalization + +AM_CONDITIONAL(DISABLE_XCMS, [test x$XCMS = xno ]) +if test "$XCMS" = no; then + AC_DEFINE(DISABLE_XCMS,1,[No support for XCMS]) +fi + +AM_CONDITIONAL(DISABLE_XLOCALE, [ test x$XLOCALE = xno ]) +if test "$XLOCALE" = no; then + AC_DEFINE(DISABLE_XLOCALE,1,[No support for X Locales]) +fi + +AM_CONDITIONAL(XKB, [ test x$XKB = xyes ]) +if test "$XKB" = yes; then + AC_DEFINE(XKB, YES, [Use XKB]) +fi + +if test "x$GCC" = "xyes"; then + GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ + -Wmissing-prototypes -Wmissing-declarations \ + -Wnested-externs -fno-strict-aliasing" + X11_CFLAGS="$GCC_WARNINGS $X11_CFLAGS" +fi + +X11_DATADIR='${datadir}/X11' +X11_LOCALEDIR='${X11_DATADIR}/locale' + +AC_SUBST(X11_DATADIR) +AC_SUBST(X11_LOCALEDIR) + +AC_OUTPUT([Makefile + include/Makefile + man/Makefile + src/Makefile + src/util/Makefile + nls/Makefile + nls/armscii-8/Makefile + nls/C/Makefile + nls/en_US.UTF-8/Makefile + nls/georgian-academy/Makefile + nls/georgian-ps/Makefile + nls/ibm-cp1133/Makefile + nls/iscii-dev/Makefile + nls/isiri-3342/Makefile + nls/iso8859-1/Makefile + nls/iso8859-10/Makefile + nls/iso8859-11/Makefile + nls/iso8859-13/Makefile + nls/iso8859-14/Makefile + nls/iso8859-15/Makefile + nls/iso8859-2/Makefile + nls/iso8859-3/Makefile + nls/iso8859-4/Makefile + nls/iso8859-5/Makefile + nls/iso8859-6/Makefile + nls/iso8859-7/Makefile + nls/iso8859-8/Makefile + nls/iso8859-9/Makefile + nls/iso8859-9e/Makefile + nls/ja/Makefile + nls/ja.JIS/Makefile + nls/ja_JP.UTF-8/Makefile + nls/ja.S90/Makefile + nls/ja.SJIS/Makefile + nls/ja.U90/Makefile + nls/ko/Makefile + nls/koi8-c/Makefile + nls/koi8-r/Makefile + nls/koi8-u/Makefile + nls/ko_KR.UTF-8/Makefile + nls/microsoft-cp1251/Makefile + nls/microsoft-cp1255/Makefile + nls/microsoft-cp1256/Makefile + nls/mulelao-1/Makefile + nls/nokhchi-1/Makefile + nls/pt_BR.UTF-8/Makefile + nls/tatar-cyr/Makefile + nls/th_TH/Makefile + nls/th_TH.UTF-8/Makefile + nls/tscii-0/Makefile + nls/vi_VN.tcvn/Makefile + nls/vi_VN.viscii/Makefile + nls/zh_CN/Makefile + nls/zh_CN.gb18030/Makefile + nls/zh_CN.gbk/Makefile + nls/zh_CN.UTF-8/Makefile + nls/zh_HK.big5/Makefile + nls/zh_HK.big5hkscs/Makefile + nls/zh_HK.UTF-8/Makefile + nls/zh_TW/Makefile + nls/zh_TW.big5/Makefile + nls/zh_TW.UTF-8/Makefile + x11.pc]) diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 00000000..3452c9c8 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,11 @@ +x11includedir=${includedir}/X11 +x11include_HEADERS=\ + X11/XKBlib.h \ + X11/Xcms.h \ + X11/Xlib.h \ + X11/Xlibint.h \ + X11/Xlocale.h \ + X11/Xresource.h \ + X11/Xutil.h \ + X11/cursorfont.h \ + X11/region.h diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 00000000..d2c6292f --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,184 @@ +man_MANS = \ + AllPlanes.3 \ + BlkPScrn.3 \ + Dis3C.3 \ + ImageOrd.3 \ + IsCKey.3 \ + XACHints.3 \ + XAIcSize.3 \ + XASCmap.3 \ + XASHints.3 \ + XAWMHints.3 \ + XAddHost.3 \ + XAllColor.3 \ + XAllEvnt.3 \ + XAnyEvent.3 \ + XButEvent.3 \ + XCKCntrl.3 \ + XCKMping.3 \ + XCMEvent.3 \ + XCPCntrl.3 \ + XCSSet.3 \ + XCWAttrib.3 \ + XCWEvent.3 \ + XCirEvent.3 \ + XCirREven.3 \ + XClrArea.3 \ + XCmpEvent.3 \ + XConEvent.3 \ + XConREven.3 \ + XConfWin.3 \ + XCopyArea.3 \ + XCreCmap.3 \ + XCreFCur.3 \ + XCreFSet.3 \ + XCreGC.3 \ + XCreIC.3 \ + XCreImage.3 \ + XCreOC.3 \ + XCrePmap.3 \ + XCreReg.3 \ + XCreWin.3 \ + XCroEvent.3 \ + XDWEvent.3 \ + XDefCur.3 \ + XDesWin.3 \ + XDrArc.3 \ + XDrIStr.3 \ + XDrLine.3 \ + XDrPoint.3 \ + XDrRect.3 \ + XDrString.3 \ + XDrText.3 \ + XERegion.3 \ + XEnumDB.3 \ + XEofFSet.3 \ + XErrEvent.3 \ + XExpEvent.3 \ + XFCEvent.3 \ + XFEvent.3 \ + XFSExt.3 \ + XFillRect.3 \ + XFlush.3 \ + XFofFSet.3 \ + XFree.3 \ + XGEEvent.3 \ + XGEvent.3 \ + XGFDBase.3 \ + XGetRes.3 \ + XGetVInfo.3 \ + XGetWAttr.3 \ + XGetWProp.3 \ + XGrButton.3 \ + XGrKey.3 \ + XGrKeybrd.3 \ + XGrPntr.3 \ + XGrServer.3 \ + XIcWin.3 \ + XIfEvent.3 \ + XInitial.3 \ + XInstCmap.3 \ + XIntConn.3 \ + XInterReg.3 \ + XInternA.3 \ + XKMapEven.3 \ + XListFont.3 \ + XLoadFont.3 \ + XLookKsym.3 \ + XMDBases.3 \ + XMEvent.3 \ + XMREvent.3 \ + XMapWin.3 \ + XNEvent.3 \ + XNoOp.3 \ + XOpDsply.3 \ + XOpenIM.3 \ + XOpenOM.3 \ + XPEvent.3 \ + XParGeom.3 \ + XPolyReg.3 \ + XPutBEvnt.3 \ + XPutImage.3 \ + XPutRes.3 \ + XQBSize.3 \ + XQColor.3 \ + XQPointer.3 \ + XQTree.3 \ + XREvent.3 \ + XRMStr.3 \ + XRREvent.3 \ + XRaiseWin.3 \ + XReadBF.3 \ + XRecCur.3 \ + XReparWin.3 \ + XSCEvent.3 \ + XSContext.3 \ + XSEvent.3 \ + XSICFoc.3 \ + XSICVals.3 \ + XSInput.3 \ + XSLTTProp.3 \ + XSREvent.3 \ + XSeArcMod.3 \ + XSeClipO.3 \ + XSeClosDM.3 \ + XSeCmd.3 \ + XSeErrHan.3 \ + XSeEvent.3 \ + XSeFillS.3 \ + XSeFont.3 \ + XSeFontP.3 \ + XSeInFoc.3 \ + XSeLAttr.3 \ + XSePMap.3 \ + XSeScSav.3 \ + XSeSelOwn.3 \ + XSeState.3 \ + XSeTFHint.3 \ + XSeTProp.3 \ + XSeTile.3 \ + XSeWMCMac.3 \ + XSeWMCWin.3 \ + XSeWMINam.3 \ + XSeWMName.3 \ + XSeWMProp.3 \ + XSeWMProt.3 \ + XStBytes.3 \ + XStColors.3 \ + XStTKsym.3 \ + XSupLoc.3 \ + XSync.3 \ + XTLTTProp.3 \ + XTextExt.3 \ + XTextWid.3 \ + XThreads.3 \ + XTranWCo.3 \ + XUQuark.3 \ + XUmapEven.3 \ + XUnmapWin.3 \ + XVCNList.3 \ + XVEvent.3 \ + XWarpPntr.3 \ + Xcms3CoC.3 \ + XcmsAClr.3 \ + XcmsCClrs.3 \ + XcmsClr.3 \ + XcmsCre3C.3 \ + XcmsD3C.3 \ + XcmsLaQMC.3 \ + XcmsLuQMC.3 \ + XcmsQBlk.3 \ + XcmsQClr.3 \ + XcmsSClr.3 \ + XcmsSWP.3 \ + XcmsTQMC.3 \ + XmbDIStr.3 \ + XmbDStr.3 \ + XmbDTxt.3 \ + XmbLStr.3 \ + XmbRIC.3 \ + XmbTEsc.3 \ + XmbTExt.3 \ + XmbTPCEx.3 + +EXTRA_DIST=$(man_MANS) diff --git a/modules/im/ximcp/imCallbk.c b/modules/im/ximcp/imCallbk.c index 10f19d3a..867746cb 100644 --- a/modules/im/ximcp/imCallbk.c +++ b/modules/im/ximcp/imCallbk.c @@ -34,6 +34,9 @@ PERFORMANCE OF THIS SOFTWARE. ***********************************************************************/ /* $XFree86: xc/lib/X11/imCallbk.c,v 3.9 2003/08/22 13:29:16 pascal Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c index 5452d31f..ccf3ba34 100644 --- a/modules/im/ximcp/imDefFlt.c +++ b/modules/im/ximcp/imDefFlt.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imDefFlt.c,v 1.4 2001/01/17 19:41:51 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c index 8f3257e3..e12501af 100644 --- a/modules/im/ximcp/imDefIc.c +++ b/modules/im/ximcp/imDefIc.c @@ -30,6 +30,9 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imDefIc.c,v 3.9 2003/04/13 19:22:20 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/modules/im/ximcp/imDefIm.c b/modules/im/ximcp/imDefIm.c index 9e631028..7581548e 100644 --- a/modules/im/ximcp/imDefIm.c +++ b/modules/im/ximcp/imDefIm.c @@ -33,6 +33,9 @@ OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imDefIm.c,v 1.15 2003/08/22 19:27:24 eich Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c index 2baa2fe5..aa1aaaf0 100644 --- a/modules/im/ximcp/imDefLkup.c +++ b/modules/im/ximcp/imDefLkup.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imDefLkup.c,v 3.11 2003/06/23 17:35:43 eich Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" diff --git a/modules/im/ximcp/imDispch.c b/modules/im/ximcp/imDispch.c index a9b3175b..c0c4bc72 100644 --- a/modules/im/ximcp/imDispch.c +++ b/modules/im/ximcp/imDispch.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imDispch.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlib.h> #include "Xlibint.h" #include "Xutil.h" diff --git a/modules/im/ximcp/imEvToWire.c b/modules/im/ximcp/imEvToWire.c index 8e37dc64..f407296d 100644 --- a/modules/im/ximcp/imEvToWire.c +++ b/modules/im/ximcp/imEvToWire.c @@ -24,6 +24,9 @@ SOFTWARE. /* $XFree86$ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xlib.h> #undef NEED_EVENTS diff --git a/modules/im/ximcp/imExten.c b/modules/im/ximcp/imExten.c index b6aa877e..782d1c35 100644 --- a/modules/im/ximcp/imExten.c +++ b/modules/im/ximcp/imExten.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imExten.c,v 1.4 2003/04/13 19:22:21 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" diff --git a/modules/im/ximcp/imImSw.c b/modules/im/ximcp/imImSw.c index 51e13e7a..e2c113b2 100644 --- a/modules/im/ximcp/imImSw.c +++ b/modules/im/ximcp/imImSw.c @@ -34,6 +34,9 @@ THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imImSw.c,v 1.3 2001/01/17 19:41:51 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c index 6dfcac4c..ac39f9df 100644 --- a/modules/im/ximcp/imInsClbk.c +++ b/modules/im/ximcp/imInsClbk.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imInsClbk.c,v 3.3 2003/05/27 22:26:26 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xatom.h> #define NEED_EVENTS #include "Xlibint.h" diff --git a/modules/im/ximcp/imInt.c b/modules/im/ximcp/imInt.c index 492c7253..5a047e4a 100644 --- a/modules/im/ximcp/imInt.c +++ b/modules/im/ximcp/imInt.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imInt.c,v 3.12 2003/04/17 02:06:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xatom.h> #include <X11/Xlib.h> #include <X11/Xmd.h> diff --git a/modules/im/ximcp/imLcFlt.c b/modules/im/ximcp/imLcFlt.c index e038c5f1..c3c64bf4 100644 --- a/modules/im/ximcp/imLcFlt.c +++ b/modules/im/ximcp/imLcFlt.c @@ -31,6 +31,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/keysym.h> #include "Xlcint.h" diff --git a/modules/im/ximcp/imLcGIc.c b/modules/im/ximcp/imLcGIc.c index 4f37fd04..e4f89a0f 100644 --- a/modules/im/ximcp/imLcGIc.c +++ b/modules/im/ximcp/imLcGIc.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/modules/im/ximcp/imLcIc.c b/modules/im/ximcp/imLcIc.c index 1fbb694e..760e24c5 100644 --- a/modules/im/ximcp/imLcIc.c +++ b/modules/im/ximcp/imLcIc.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imLcIc.c,v 1.4 2001/01/17 19:41:52 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xlib.h> #include <X11/Xmd.h> diff --git a/modules/im/ximcp/imLcIm.c b/modules/im/ximcp/imLcIm.c index e10ed919..675b4822 100644 --- a/modules/im/ximcp/imLcIm.c +++ b/modules/im/ximcp/imLcIm.c @@ -34,6 +34,9 @@ THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imLcIm.c,v 1.12 2003/09/06 14:06:32 pascal Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> /* #include <X11/Xlib.h> diff --git a/modules/im/ximcp/imLcLkup.c b/modules/im/ximcp/imLcLkup.c index f21e5c56..59025a52 100644 --- a/modules/im/ximcp/imLcLkup.c +++ b/modules/im/ximcp/imLcLkup.c @@ -31,6 +31,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imLcLkup.c,v 3.8 2003/06/23 17:35:43 eich Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xatom.h> #include <X11/Xos.h> diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c index ee2c4b8d..fbad5a22 100644 --- a/modules/im/ximcp/imLcPrs.c +++ b/modules/im/ximcp/imLcPrs.c @@ -32,6 +32,9 @@ OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/lib/X11/imLcPrs.c,v 1.10 2003/09/06 14:06:32 pascal Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlib.h> #include <X11/Xmd.h> #include <X11/Xos.h> diff --git a/modules/im/ximcp/imLcSIc.c b/modules/im/ximcp/imLcSIc.c index 16ada9bc..a32211ce 100644 --- a/modules/im/ximcp/imLcSIc.c +++ b/modules/im/ximcp/imLcSIc.c @@ -27,6 +27,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xlib.h> #include <X11/Xmd.h> diff --git a/modules/im/ximcp/imRm.c b/modules/im/ximcp/imRm.c index 57aa760c..7dbc385c 100644 --- a/modules/im/ximcp/imRm.c +++ b/modules/im/ximcp/imRm.c @@ -32,6 +32,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imRm.c,v 3.12 2003/04/13 19:22:21 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xlib.h> #include "Xlibint.h" diff --git a/modules/im/ximcp/imRmAttr.c b/modules/im/ximcp/imRmAttr.c index 4f18bee4..af4db3db 100644 --- a/modules/im/ximcp/imRmAttr.c +++ b/modules/im/ximcp/imRmAttr.c @@ -28,6 +28,9 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imRmAttr.c,v 1.7 2003/04/13 19:22:21 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" diff --git a/modules/im/ximcp/imThaiFlt.c b/modules/im/ximcp/imThaiFlt.c index ae546175..18df0e1f 100644 --- a/modules/im/ximcp/imThaiFlt.c +++ b/modules/im/ximcp/imThaiFlt.c @@ -64,6 +64,9 @@ SOFTWARE. ** **/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xlib.h> #include <X11/Xmd.h> diff --git a/modules/im/ximcp/imThaiIc.c b/modules/im/ximcp/imThaiIc.c index 997ee8b4..67d7cc26 100644 --- a/modules/im/ximcp/imThaiIc.c +++ b/modules/im/ximcp/imThaiIc.c @@ -34,6 +34,9 @@ THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imThaiIc.c,v 1.4 2001/01/17 19:41:52 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xlib.h> #include <X11/Xmd.h> diff --git a/modules/im/ximcp/imThaiIm.c b/modules/im/ximcp/imThaiIm.c index 5a3c0faf..e2471502 100644 --- a/modules/im/ximcp/imThaiIm.c +++ b/modules/im/ximcp/imThaiIm.c @@ -34,6 +34,9 @@ THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imThaiIm.c,v 1.7 2001/01/17 19:41:52 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xlib.h> #include <X11/Xmd.h> diff --git a/modules/im/ximcp/imTrX.c b/modules/im/ximcp/imTrX.c index c226cc69..e2de05f2 100644 --- a/modules/im/ximcp/imTrX.c +++ b/modules/im/ximcp/imTrX.c @@ -30,6 +30,9 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imTrX.c,v 1.3 2003/04/13 19:22:21 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <string.h> #include <X11/Xatom.h> #define NEED_EVENTS diff --git a/modules/im/ximcp/imTrans.c b/modules/im/ximcp/imTrans.c index 2da2d686..7a941ceb 100644 --- a/modules/im/ximcp/imTrans.c +++ b/modules/im/ximcp/imTrans.c @@ -30,6 +30,9 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imTrans.c,v 1.3 2003/04/17 02:06:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xatom.h> #include <X11/Xmd.h> diff --git a/modules/im/ximcp/imTransR.c b/modules/im/ximcp/imTransR.c index 3fea1b3f..5ca4a39c 100644 --- a/modules/im/ximcp/imTransR.c +++ b/modules/im/ximcp/imTransR.c @@ -30,6 +30,9 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/imTransR.c,v 3.6 2003/04/17 02:39:56 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include "XimTrInt.h" diff --git a/modules/lc/Utf8/lcUTF8Load.c b/modules/lc/Utf8/lcUTF8Load.c index 30e48dd1..f4bff288 100644 --- a/modules/lc/Utf8/lcUTF8Load.c +++ b/modules/lc/Utf8/lcUTF8Load.c @@ -32,6 +32,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Platforms: all systems. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "XlcPubI.h" diff --git a/modules/lc/def/lcDefConv.c b/modules/lc/def/lcDefConv.c index 4bcbe6bf..fb504d11 100644 --- a/modules/lc/def/lcDefConv.c +++ b/modules/lc/def/lcDefConv.c @@ -36,6 +36,9 @@ * Platforms: all systems. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcGeneric.h" diff --git a/modules/lc/gen/lcGenConv.c b/modules/lc/gen/lcGenConv.c index 1720a8f2..76e7d0f7 100644 --- a/modules/lc/gen/lcGenConv.c +++ b/modules/lc/gen/lcGenConv.c @@ -48,6 +48,9 @@ * Platforms: all systems. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcGeneric.h" #include <stdio.h> diff --git a/modules/lc/xlocale/lcEuc.c b/modules/lc/xlocale/lcEuc.c index 183751fe..1b54508b 100644 --- a/modules/lc/xlocale/lcEuc.c +++ b/modules/lc/xlocale/lcEuc.c @@ -41,6 +41,9 @@ OF THIS SOFTWARE. #ifdef X_LOCALE +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcGeneric.h" diff --git a/modules/lc/xlocale/lcJis.c b/modules/lc/xlocale/lcJis.c index 9f937737..bdd46e36 100644 --- a/modules/lc/xlocale/lcJis.c +++ b/modules/lc/xlocale/lcJis.c @@ -34,6 +34,9 @@ #ifdef X_LOCALE +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcGeneric.h" #include <stdio.h> diff --git a/modules/lc/xlocale/lcSjis.c b/modules/lc/xlocale/lcSjis.c index 17e33d5c..6adb2945 100644 --- a/modules/lc/xlocale/lcSjis.c +++ b/modules/lc/xlocale/lcSjis.c @@ -46,6 +46,9 @@ OR PERFORMANCE OF THIS SOFTWARE. #ifdef X_LOCALE +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcGeneric.h" diff --git a/modules/om/generic/omDefault.c b/modules/om/generic/omDefault.c index a4765b53..57dd975a 100644 --- a/modules/om/generic/omDefault.c +++ b/modules/om/generic/omDefault.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/lib/X11/omDefault.c,v 1.6 2003/04/13 19:22:22 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XomGeneric.h" #include <X11/Xos.h> diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c index 57c31410..e6c23f4e 100644 --- a/modules/om/generic/omGeneric.c +++ b/modules/om/generic/omGeneric.c @@ -49,6 +49,9 @@ * Egbert Eich, SuSE Linux AG */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XomGeneric.h" #include "XlcGeneric.h" diff --git a/modules/om/generic/omImText.c b/modules/om/generic/omImText.c index 25ee615d..627c45b8 100644 --- a/modules/om/generic/omImText.c +++ b/modules/om/generic/omImText.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/omImText.c,v 1.5 2003/04/13 19:22:22 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XomGeneric.h" diff --git a/modules/om/generic/omText.c b/modules/om/generic/omText.c index 28c49b76..189aabd1 100644 --- a/modules/om/generic/omText.c +++ b/modules/om/generic/omText.c @@ -33,6 +33,9 @@ * Modifiers: Jeff Walls, Paul Anderson (HEWLETT-PACKARD) */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XomGeneric.h" #include <stdio.h> diff --git a/modules/om/generic/omTextEsc.c b/modules/om/generic/omTextEsc.c index f9b9ebd8..03b76d9f 100644 --- a/modules/om/generic/omTextEsc.c +++ b/modules/om/generic/omTextEsc.c @@ -30,6 +30,9 @@ * Development Agreement for the CDE/Motif PST. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XomGeneric.h" #include <stdio.h> diff --git a/modules/om/generic/omTextExt.c b/modules/om/generic/omTextExt.c index 8186f963..4117e60f 100644 --- a/modules/om/generic/omTextExt.c +++ b/modules/om/generic/omTextExt.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/omTextExt.c,v 1.5 2003/04/13 19:22:22 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XomGeneric.h" #include <stdio.h> diff --git a/modules/om/generic/omTextPer.c b/modules/om/generic/omTextPer.c index 816c9f52..17a18657 100644 --- a/modules/om/generic/omTextPer.c +++ b/modules/om/generic/omTextPer.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/omTextPer.c,v 1.6 2003/04/13 19:22:22 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XomGeneric.h" #include <stdio.h> diff --git a/modules/om/generic/omXChar.c b/modules/om/generic/omXChar.c index 73b7708d..4afafd40 100644 --- a/modules/om/generic/omXChar.c +++ b/modules/om/generic/omXChar.c @@ -36,6 +36,9 @@ */ /* $XFree86: xc/lib/X11/omXChar.c,v 1.6tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcPublic.h" #include "XomGeneric.h" diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/C/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/Makefile.am b/nls/Makefile.am new file mode 100644 index 00000000..a01b5cd4 --- /dev/null +++ b/nls/Makefile.am @@ -0,0 +1,71 @@ +x11localedir = @X11_LOCALEDIR@ + +EXTRA_DIST = locale.alias.pre + +dist_x11locale_DATA=locale.dir compose.dir +x11locale_DATA=locale.alias + +DISTCLEANFILES=locale.alias XLC_LOCALE + +SUBDIRS= \ + armscii-8 \ + C \ + en_US.UTF-8 \ + georgian-academy \ + georgian-ps \ + ibm-cp1133 \ + iscii-dev \ + isiri-3342 \ + iso8859-1 \ + iso8859-10 \ + iso8859-11 \ + iso8859-13 \ + iso8859-14 \ + iso8859-15 \ + iso8859-2 \ + iso8859-3 \ + iso8859-4 \ + iso8859-5 \ + iso8859-6 \ + iso8859-7 \ + iso8859-8 \ + iso8859-9 \ + iso8859-9e \ + ja \ + ja.JIS \ + ja_JP.UTF-8 \ + ja.S90 \ + ja.SJIS \ + ja.U90 \ + ko \ + koi8-c \ + koi8-r \ + koi8-u \ + ko_KR.UTF-8 \ + microsoft-cp1251 \ + microsoft-cp1255 \ + microsoft-cp1256 \ + mulelao-1 \ + nokhchi-1 \ + pt_BR.UTF-8 \ + tatar-cyr \ + th_TH \ + th_TH.UTF-8 \ + tscii-0 \ + vi_VN.tcvn \ + vi_VN.viscii \ + zh_CN \ + zh_CN.gb18030 \ + zh_CN.gbk \ + zh_CN.UTF-8 \ + zh_HK.big5 \ + zh_HK.big5hkscs \ + zh_HK.UTF-8 \ + zh_TW \ + zh_TW.big5 \ + zh_TW.UTF-8 + +locale.alias: locale.alias.pre + $(CPP) -traditional -DXCOMM='#' - < $< > locale.alias.l1 + sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d' \ + < locale.alias.l1 > locale.alias diff --git a/nls/armscii-8/Makefile.am b/nls/armscii-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/armscii-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/en_US.UTF-8/Makefile.am b/nls/en_US.UTF-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/en_US.UTF-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/georgian-academy/Makefile.am b/nls/georgian-academy/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/georgian-academy/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/georgian-ps/Makefile.am b/nls/georgian-ps/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/georgian-ps/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ibm-cp1133/Makefile.am b/nls/ibm-cp1133/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ibm-cp1133/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iscii-dev/Makefile.am b/nls/iscii-dev/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iscii-dev/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/isiri-3342/Makefile.am b/nls/isiri-3342/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/isiri-3342/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-1/Makefile.am b/nls/iso8859-1/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-1/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-10/Makefile.am b/nls/iso8859-10/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-10/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-11/Makefile.am b/nls/iso8859-11/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-11/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-13/Makefile.am b/nls/iso8859-13/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-13/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-14/Makefile.am b/nls/iso8859-14/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-14/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-15/Makefile.am b/nls/iso8859-15/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-15/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-2/Makefile.am b/nls/iso8859-2/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-2/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-3/Makefile.am b/nls/iso8859-3/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-3/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-4/Makefile.am b/nls/iso8859-4/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-4/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-5/Makefile.am b/nls/iso8859-5/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-5/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-6/Makefile.am b/nls/iso8859-6/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-6/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-7/Makefile.am b/nls/iso8859-7/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-7/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-8/Makefile.am b/nls/iso8859-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-9/Makefile.am b/nls/iso8859-9/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-9/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/iso8859-9e/Makefile.am b/nls/iso8859-9e/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/iso8859-9e/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ja.JIS/Makefile.am b/nls/ja.JIS/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ja.JIS/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ja.S90/Makefile.am b/nls/ja.S90/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ja.S90/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ja.SJIS/Makefile.am b/nls/ja.SJIS/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ja.SJIS/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ja.U90/Makefile.am b/nls/ja.U90/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ja.U90/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ja/Makefile.am b/nls/ja/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ja/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ja_JP.UTF-8/Makefile.am b/nls/ja_JP.UTF-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ja_JP.UTF-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ko/Makefile.am b/nls/ko/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ko/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/ko_KR.UTF-8/Makefile.am b/nls/ko_KR.UTF-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/ko_KR.UTF-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/koi8-c/Makefile.am b/nls/koi8-c/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/koi8-c/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/koi8-r/Makefile.am b/nls/koi8-r/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/koi8-r/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/koi8-u/Makefile.am b/nls/koi8-u/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/koi8-u/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/microsoft-cp1251/Makefile.am b/nls/microsoft-cp1251/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/microsoft-cp1251/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/microsoft-cp1255/Makefile.am b/nls/microsoft-cp1255/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/microsoft-cp1255/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/microsoft-cp1256/Makefile.am b/nls/microsoft-cp1256/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/microsoft-cp1256/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/mulelao-1/Makefile.am b/nls/mulelao-1/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/mulelao-1/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/nokhchi-1/Makefile.am b/nls/nokhchi-1/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/nokhchi-1/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/pt_BR.UTF-8/Makefile.am b/nls/pt_BR.UTF-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/pt_BR.UTF-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/tatar-cyr/Makefile.am b/nls/tatar-cyr/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/tatar-cyr/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/th_TH.UTF-8/Makefile.am b/nls/th_TH.UTF-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/th_TH.UTF-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/th_TH/Makefile.am b/nls/th_TH/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/th_TH/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/tscii-0/Makefile.am b/nls/tscii-0/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/tscii-0/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/vi_VN.tcvn/Makefile.am b/nls/vi_VN.tcvn/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/vi_VN.tcvn/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/vi_VN.viscii/Makefile.am b/nls/vi_VN.viscii/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/vi_VN.viscii/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_CN.UTF-8/Makefile.am b/nls/zh_CN.UTF-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_CN.UTF-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_CN.gb18030/Makefile.am b/nls/zh_CN.gb18030/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_CN.gb18030/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_CN.gbk/Makefile.am b/nls/zh_CN.gbk/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_CN.gbk/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_CN/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_HK.UTF-8/Makefile.am b/nls/zh_HK.UTF-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_HK.UTF-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_HK.big5/Makefile.am b/nls/zh_HK.big5/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_HK.big5/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_HK.big5hkscs/Makefile.am b/nls/zh_HK.big5hkscs/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_HK.big5hkscs/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_TW.UTF-8/Makefile.am b/nls/zh_TW.UTF-8/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_TW.UTF-8/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_TW.big5/Makefile.am b/nls/zh_TW.big5/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_TW.big5/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/nls/zh_TW/Makefile.am b/nls/zh_TW/Makefile.am new file mode 100644 index 00000000..b2b1c8a8 --- /dev/null +++ b/nls/zh_TW/Makefile.am @@ -0,0 +1,18 @@ +x11thislocaledir = @X11_LOCALEDIR@/$(shell basename `pwd`) + +EXTRA_DIST = XLC_LOCALE.pre Compose.pre + +dist_x11thislocale_DATA = XI18N_OBJS +x11thislocale_DATA = XLC_LOCALE Compose + +# XXX: WCHAR32 definition <<-- WTF does this mean? +XLC_LOCALE: XLC_LOCALE.pre + $(CPP) -traditional -DWCHAR32=1 -DXCOMM='#' - < $< > $@ + +Compose: Compose.pre + $(CPP) -traditional -DXCOMM='#' - < $< > $@ + +Compose.pre: + touch Compose.pre + +DISTCLEANFILES=XLC_LOCALE Compose diff --git a/src/AllCells.c b/src/AllCells.c index 495d9a36..ed7bc845 100644 --- a/src/AllCells.c +++ b/src/AllCells.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XAllocColorCells(dpy, cmap, contig, masks, nplanes, pixels, ncolors) diff --git a/src/AllPlanes.c b/src/AllPlanes.c index 5f7e6bcc..079422be 100644 --- a/src/AllPlanes.c +++ b/src/AllPlanes.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/AllPlanes.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XAllocColorPlanes(dpy, cmap, contig, pixels, ncolors, nreds, ngreens, diff --git a/src/AllowEv.c b/src/AllowEv.c index b87d3bec..c5905b99 100644 --- a/src/AllowEv.c +++ b/src/AllowEv.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/AllowEv.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/AutoRep.c b/src/AutoRep.c index eb6a3073..404d520b 100644 --- a/src/AutoRep.c +++ b/src/AutoRep.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/AutoRep.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/Backgnd.c b/src/Backgnd.c index 76ebb13f..dbb92425 100644 --- a/src/Backgnd.c +++ b/src/Backgnd.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Backgnd.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/BdrWidth.c b/src/BdrWidth.c index 5178032f..db6df013 100644 --- a/src/BdrWidth.c +++ b/src/BdrWidth.c @@ -29,6 +29,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/BdrWidth.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Bell.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/Border.c b/src/Border.c index 29f55555..8f0bdb68 100644 --- a/src/Border.c +++ b/src/Border.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Border.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChAccCon.c b/src/ChAccCon.c index 4d9281db..eef3bb01 100644 --- a/src/ChAccCon.c +++ b/src/ChAccCon.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChAccCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChActPGb.c b/src/ChActPGb.c index e1df3431..42ec3305 100644 --- a/src/ChActPGb.c +++ b/src/ChActPGb.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChActPGb.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChClMode.c b/src/ChClMode.c index 4faa37f5..1b22f68b 100644 --- a/src/ChClMode.c +++ b/src/ChClMode.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChClMode.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChCmap.c b/src/ChCmap.c index f3c02ded..112c944b 100644 --- a/src/ChCmap.c +++ b/src/ChCmap.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChCmap.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChGC.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Cr.h" diff --git a/src/ChKeyCon.c b/src/ChKeyCon.c index bc5419f4..831f6f0e 100644 --- a/src/ChKeyCon.c +++ b/src/ChKeyCon.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChKeyCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChPntCon.c b/src/ChPntCon.c index 0a0fd6f0..225d031c 100644 --- a/src/ChPntCon.c +++ b/src/ChPntCon.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChPntCon.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChProp.c b/src/ChProp.c index 606277d6..8c524caf 100644 --- a/src/ChProp.c +++ b/src/ChProp.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChProp.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChSaveSet.c b/src/ChSaveSet.c index a048b7bb..9862db72 100644 --- a/src/ChSaveSet.c +++ b/src/ChSaveSet.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChSaveSet.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChWAttrs.c b/src/ChWAttrs.c index 215980b1..57b81ab1 100644 --- a/src/ChWAttrs.c +++ b/src/ChWAttrs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChWAttrs.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define AllMaskBits (CWBackPixmap|CWBackPixel|CWBorderPixmap|\ diff --git a/src/ChWindow.c b/src/ChWindow.c index 41af3bed..a403d76d 100644 --- a/src/ChWindow.c +++ b/src/ChWindow.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ChWindow.c,v 1.5 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c index 7c56f52e..ff74bcd7 100644 --- a/src/ChkIfEv.c +++ b/src/ChkIfEv.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86$ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/ChkMaskEv.c b/src/ChkMaskEv.c index 961dce69..92b569f7 100644 --- a/src/ChkMaskEv.c +++ b/src/ChkMaskEv.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ChkMaskEv.c,v 3.5 2001/10/28 03:32:29 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" extern long const _Xevent_to_mask[]; diff --git a/src/ChkTypEv.c b/src/ChkTypEv.c index c1c36d43..8fd879d1 100644 --- a/src/ChkTypEv.c +++ b/src/ChkTypEv.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ChkTypEv.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/ChkTypWEv.c b/src/ChkTypWEv.c index c15f2bcf..83b6244d 100644 --- a/src/ChkTypWEv.c +++ b/src/ChkTypWEv.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ChkTypWEv.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/ChkWinEv.c b/src/ChkWinEv.c index 2fd386d2..91d9b30e 100644 --- a/src/ChkWinEv.c +++ b/src/ChkWinEv.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ChkWinEv.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" extern long const _Xevent_to_mask[]; diff --git a/src/CirWin.c b/src/CirWin.c index 53c70440..100cbbe6 100644 --- a/src/CirWin.c +++ b/src/CirWin.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CirWin.c,v 1.3 2001/01/17 19:41:32 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/CirWinDn.c b/src/CirWinDn.c index b790f2d7..83a5966d 100644 --- a/src/CirWinDn.c +++ b/src/CirWinDn.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CirWinDn.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/CirWinUp.c b/src/CirWinUp.c index 12756cd3..42a26417 100644 --- a/src/CirWinUp.c +++ b/src/CirWinUp.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CirWinUp.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ClDisplay.c b/src/ClDisplay.c index 25fac7b1..74058b26 100644 --- a/src/ClDisplay.c +++ b/src/ClDisplay.c @@ -29,6 +29,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/ClDisplay.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xtrans.h> #include "Xlib.h" #include "Xlibint.h" diff --git a/src/Clear.c b/src/Clear.c index 403943bc..314d2594 100644 --- a/src/Clear.c +++ b/src/Clear.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Clear.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ClearArea.c b/src/ClearArea.c index a85eb6ba..194a6a2d 100644 --- a/src/ClearArea.c +++ b/src/ClearArea.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ClearArea.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ConfWind.c b/src/ConfWind.c index 1c5813f5..fddd2831 100644 --- a/src/ConfWind.c +++ b/src/ConfWind.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ConfWind.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ConnDis.c b/src/ConnDis.c index ca48ba07..02130f07 100644 --- a/src/ConnDis.c +++ b/src/ConnDis.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.6 2004-11-15 15:06:54 ago Exp $ */ +/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.7 2005-05-13 22:53:43 sandmann Exp $ */ /* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */ /* @@ -33,6 +33,9 @@ in this Software without prior written authorization from The Open Group. #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xtrans.h> #include <X11/Xauth.h> diff --git a/src/Context.c b/src/Context.c index fef578ff..747bb6be 100644 --- a/src/Context.c +++ b/src/Context.c @@ -64,6 +64,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" #ifdef XTHREADS diff --git a/src/ConvSel.c b/src/ConvSel.c index 24d4f83b..64739b24 100644 --- a/src/ConvSel.c +++ b/src/ConvSel.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ConvSel.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/CopyArea.c b/src/CopyArea.c index a2a92a8d..f27bfef2 100644 --- a/src/CopyArea.c +++ b/src/CopyArea.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CopyArea.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/CopyCmap.c b/src/CopyCmap.c index 9c7abcec..6025b0ca 100644 --- a/src/CopyCmap.c +++ b/src/CopyCmap.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CopyCmap.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/CopyGC.c b/src/CopyGC.c index 121bf5b8..7ca5f388 100644 --- a/src/CopyGC.c +++ b/src/CopyGC.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CopyGC.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/CopyPlane.c b/src/CopyPlane.c index 7adae39f..b8138888 100644 --- a/src/CopyPlane.c +++ b/src/CopyPlane.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CopyPlane.c,v 1.3 2001/01/17 19:41:33 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/CrBFData.c b/src/CrBFData.c index 6e9aad1b..2e665dfe 100644 --- a/src/CrBFData.c +++ b/src/CrBFData.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlib.h" /* diff --git a/src/CrCmap.c b/src/CrCmap.c index 22a2cffe..c53faeb8 100644 --- a/src/CrCmap.c +++ b/src/CrCmap.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CrCmap.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/CrCursor.c b/src/CrCursor.c index c3ce84b3..917349f0 100644 --- a/src/CrCursor.c +++ b/src/CrCursor.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #ifdef USE_DYNAMIC_XCURSOR @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CrGC.c,v 3.6 2001/12/14 19:53:59 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Cr.h" diff --git a/src/CrGlCur.c b/src/CrGlCur.c index 4fc63112..2d34a754 100644 --- a/src/CrGlCur.c +++ b/src/CrGlCur.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/CrGlCur.c,v 1.7 2003/04/13 19:22:15 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #ifdef USE_DYNAMIC_XCURSOR diff --git a/src/CrPFBData.c b/src/CrPFBData.c index f28aabbb..b65e32fc 100644 --- a/src/CrPFBData.c +++ b/src/CrPFBData.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlib.h" #include <stdio.h> diff --git a/src/CrPixmap.c b/src/CrPixmap.c index 6b4069c1..72ef6960 100644 --- a/src/CrPixmap.c +++ b/src/CrPixmap.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #ifdef USE_DYNAMIC_XCURSOR diff --git a/src/CrWindow.c b/src/CrWindow.c index 418f9867..9a15f2ec 100644 --- a/src/CrWindow.c +++ b/src/CrWindow.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Window XCreateSimpleWindow(dpy, parent, x, y, width, height, diff --git a/src/Cursor.c b/src/Cursor.c index 82242eeb..98ac36bb 100644 --- a/src/Cursor.c +++ b/src/Cursor.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Cursor.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */ static XColor _Xconst background = { 0, 65535, 65535, 65535 }; /* white */ diff --git a/src/DefCursor.c b/src/DefCursor.c index f8e479ad..053afbad 100644 --- a/src/DefCursor.c +++ b/src/DefCursor.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DefCursor.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/DelProp.c b/src/DelProp.c index 4b2171aa..fd40b754 100644 --- a/src/DelProp.c +++ b/src/DelProp.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DelProp.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/Depths.c b/src/Depths.c index 34756e71..82ce2c89 100644 --- a/src/Depths.c +++ b/src/Depths.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <stdio.h> diff --git a/src/DestSubs.c b/src/DestSubs.c index 465fc05d..3d5f48d4 100644 --- a/src/DestSubs.c +++ b/src/DestSubs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DestSubs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/DestWind.c b/src/DestWind.c index c218bc08..a079d448 100644 --- a/src/DestWind.c +++ b/src/DestWind.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DestWind.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/DisName.c b/src/DisName.c index efae8f31..59b5b3e1 100644 --- a/src/DisName.c +++ b/src/DisName.c @@ -46,6 +46,9 @@ from The Open Group. */ /* Written at Waterloo - JMSellens */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <stdlib.h> #include "Xlib.h" diff --git a/src/DrArc.c b/src/DrArc.c index 8b416dd3..31116764 100644 --- a/src/DrArc.c +++ b/src/DrArc.c @@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group. the last point in one arc coincides with the first point in another. The client wouldn't expect this and would have no easy way to defeat it. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/DrArcs.c b/src/DrArcs.c index f798b748..8e028633 100644 --- a/src/DrArcs.c +++ b/src/DrArcs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DrArcs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define arc_scale (SIZEOF(xArc) / 4) diff --git a/src/DrLine.c b/src/DrLine.c index 8d9dca21..59095069 100644 --- a/src/DrLine.c +++ b/src/DrLine.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DrLine.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* precompute the maximum size of batching request allowed */ diff --git a/src/DrLines.c b/src/DrLines.c index 198aae5c..ea8bf82b 100644 --- a/src/DrLines.c +++ b/src/DrLines.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DrLines.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/DrPoint.c b/src/DrPoint.c index c07942e3..3cd6b7f5 100644 --- a/src/DrPoint.c +++ b/src/DrPoint.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DrPoint.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* precompute the maximum size of batching request allowed */ diff --git a/src/DrPoints.c b/src/DrPoints.c index 33d3b742..1637aa89 100644 --- a/src/DrPoints.c +++ b/src/DrPoints.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DrPoints.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/DrRect.c b/src/DrRect.c index 2fa0e466..984e291c 100644 --- a/src/DrRect.c +++ b/src/DrRect.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DrRect.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* precompute the maximum size of batching request allowed */ diff --git a/src/DrRects.c b/src/DrRects.c index ff674e93..b300f2fe 100644 --- a/src/DrRects.c +++ b/src/DrRects.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DrRects.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/DrSegs.c b/src/DrSegs.c index dde949da..e7e61b89 100644 --- a/src/DrSegs.c +++ b/src/DrSegs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/DrSegs.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ErrDes.c b/src/ErrDes.c index 2f1e1de4..f45b9e29 100644 --- a/src/ErrDes.c +++ b/src/ErrDes.c @@ -1,6 +1,6 @@ /* * $Xorg: ErrDes.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ - * $XdotOrg: lib/X11/src/ErrDes.c,v 1.5 2005-03-21 04:58:21 alanc Exp $ + * $XdotOrg: lib/X11/src/ErrDes.c,v 1.6 2005-05-13 22:53:43 sandmann Exp $ */ /*********************************************************** @@ -51,6 +51,9 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/ErrDes.c,v 3.11 2003/08/06 14:03:59 eich Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xos.h> #include "Xresource.h" diff --git a/src/ErrHndlr.c b/src/ErrHndlr.c index 941d219c..b3c2ce5a 100644 --- a/src/ErrHndlr.c +++ b/src/ErrHndlr.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ErrHndlr.c,v 1.6 2003/04/13 19:22:15 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/EvToWire.c b/src/EvToWire.c index 2a84c322..14335279 100644 --- a/src/EvToWire.c +++ b/src/EvToWire.c @@ -36,6 +36,9 @@ from The Open Group. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/FSSaver.c b/src/FSSaver.c index 0699257a..8ffa9593 100644 --- a/src/FSSaver.c +++ b/src/FSSaver.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FSSaver.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/FSWrap.c b/src/FSWrap.c index 2bdfa303..d40f3b03 100644 --- a/src/FSWrap.c +++ b/src/FSWrap.c @@ -58,6 +58,9 @@ from The Open Group. /* $XFree86: xc/lib/X11/FSWrap.c,v 1.8 2003/08/22 19:27:24 eich Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include <ctype.h> diff --git a/src/FetchName.c b/src/FetchName.c index 1317fa86..3d41472f 100644 --- a/src/FetchName.c +++ b/src/FetchName.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include <X11/Xos.h> diff --git a/src/FillArc.c b/src/FillArc.c index 3866a891..2aa88d8f 100644 --- a/src/FillArc.c +++ b/src/FillArc.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FillArc.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* precompute the maximum size of batching request allowed */ diff --git a/src/FillArcs.c b/src/FillArcs.c index c644f306..27f0b8ff 100644 --- a/src/FillArcs.c +++ b/src/FillArcs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FillArcs.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define arc_scale (SIZEOF(xArc) / 4) diff --git a/src/FillPoly.c b/src/FillPoly.c index a363247f..93884d79 100644 --- a/src/FillPoly.c +++ b/src/FillPoly.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FillPoly.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/FillRct.c b/src/FillRct.c index 79da709f..d4a362af 100644 --- a/src/FillRct.c +++ b/src/FillRct.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FillRct.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* precompute the maximum size of batching request allowed */ diff --git a/src/FillRcts.c b/src/FillRcts.c index 017cd0c3..0c234f01 100644 --- a/src/FillRcts.c +++ b/src/FillRcts.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FillRcts.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/FilterEv.c b/src/FilterEv.c index afc7b444..9a0f4c63 100644 --- a/src/FilterEv.c +++ b/src/FilterEv.c @@ -56,6 +56,9 @@ from The Open Group. /* $XFree86: xc/lib/X11/FilterEv.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/Flush.c b/src/Flush.c index 58eb4e6d..3df8731b 100644 --- a/src/Flush.c +++ b/src/Flush.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Flush.c,v 1.3 2001/01/17 19:41:35 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* Flush all buffered output requests. */ @@ -30,6 +30,9 @@ authorization from the X Consortium and the XFree86 Project. /* $XFree86: xc/lib/X11/Font.c,v 1.17 2003/04/13 19:22:16 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #if defined(XF86BIGFONT) && !defined(MUSTCOPY) diff --git a/src/FontInfo.c b/src/FontInfo.c index a98d0736..f9237585 100644 --- a/src/FontInfo.c +++ b/src/FontInfo.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/FontInfo.c,v 1.6 2001/12/14 19:54:00 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #if defined(XF86BIGFONT) && !defined(MUSTCOPY) diff --git a/src/FontNames.c b/src/FontNames.c index f6e7036e..0db27a22 100644 --- a/src/FontNames.c +++ b/src/FontNames.c @@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/FontNames.c,v 1.6 2001/12/14 19:54:00 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" char ** diff --git a/src/FreeCmap.c b/src/FreeCmap.c index 1195b3ad..c399c1f2 100644 --- a/src/FreeCmap.c +++ b/src/FreeCmap.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FreeCmap.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlib.h" #include "Xlibint.h" #include "Cmap.h" diff --git a/src/FreeCols.c b/src/FreeCols.c index d9516bad..1ae52586 100644 --- a/src/FreeCols.c +++ b/src/FreeCols.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FreeCols.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/FreeCurs.c b/src/FreeCurs.c index 8fff916a..45f5d044 100644 --- a/src/FreeCurs.c +++ b/src/FreeCurs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FreeCurs.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/FreeEData.c b/src/FreeEData.c index d3555d54..d8278cba 100644 --- a/src/FreeEData.c +++ b/src/FreeEData.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FreeEData.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/FreeGC.c b/src/FreeGC.c index 96e61de3..ccfbba5d 100644 --- a/src/FreeGC.c +++ b/src/FreeGC.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FreeGC.c,v 1.4 2001/08/18 02:41:28 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/FreePix.c b/src/FreePix.c index 40ad42f3..5fe65bab 100644 --- a/src/FreePix.c +++ b/src/FreePix.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/FreePix.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/GCMisc.c b/src/GCMisc.c index 62f4af00..5a8233be 100644 --- a/src/GCMisc.c +++ b/src/GCMisc.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/GCMisc.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int @@ -29,6 +29,9 @@ from The Open Group. */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" diff --git a/src/GetAtomNm.c b/src/GetAtomNm.c index 495fb426..1bba975d 100644 --- a/src/GetAtomNm.c +++ b/src/GetAtomNm.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetAtomNm.c,v 3.4 2001/08/18 02:41:28 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xintatom.h" diff --git a/src/GetColor.c b/src/GetColor.c index 2ccaf92f..530f479d 100644 --- a/src/GetColor.c +++ b/src/GetColor.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetColor.c,v 1.6 2003/04/13 19:22:16 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/GetDflt.c b/src/GetDflt.c index 3c7ba344..8a856337 100644 --- a/src/GetDflt.c +++ b/src/GetDflt.c @@ -48,6 +48,9 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/GetDflt.c,v 3.22 2003/04/13 19:22:16 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xos.h> #include <X11/Xresource.h> diff --git a/src/GetFPath.c b/src/GetFPath.c index 6db1602e..03ad5daf 100644 --- a/src/GetFPath.c +++ b/src/GetFPath.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetFPath.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" char **XGetFontPath(dpy, npaths) diff --git a/src/GetFProp.c b/src/GetFProp.c index f588c2f0..1360ca10 100644 --- a/src/GetFProp.c +++ b/src/GetFProp.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Bool XGetFontProperty (fs, name, valuePtr) diff --git a/src/GetGCVals.c b/src/GetGCVals.c index e8875869..a7fbd743 100644 --- a/src/GetGCVals.c +++ b/src/GetGCVals.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/GetGeom.c b/src/GetGeom.c index 367153f4..842df335 100644 --- a/src/GetGeom.c +++ b/src/GetGeom.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XGetGeometry (dpy, d, root, x, y, width, height, borderWidth, depth) diff --git a/src/GetHColor.c b/src/GetHColor.c index 33e6ad59..647cc11c 100644 --- a/src/GetHColor.c +++ b/src/GetHColor.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XAllocColor(dpy, cmap, def) diff --git a/src/GetHints.c b/src/GetHints.c index d2452700..4faccb62 100644 --- a/src/GetHints.c +++ b/src/GetHints.c @@ -48,6 +48,9 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/GetHints.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xos.h> #include <X11/Xutil.h> diff --git a/src/GetIFocus.c b/src/GetIFocus.c index fe1e80f8..13cab18a 100644 --- a/src/GetIFocus.c +++ b/src/GetIFocus.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetIFocus.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/GetImage.c b/src/GetImage.c index 3a2939cf..ffe9d226 100644 --- a/src/GetImage.c +++ b/src/GetImage.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetImage.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xutil.h> /* for XDestroyImage */ #include "ImUtil.h" diff --git a/src/GetKCnt.c b/src/GetKCnt.c index 525ea1b9..47f80647 100644 --- a/src/GetKCnt.c +++ b/src/GetKCnt.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetKCnt.c,v 1.5 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/GetMoEv.c b/src/GetMoEv.c index 1bead38a..e332ecfe 100644 --- a/src/GetMoEv.c +++ b/src/GetMoEv.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" XTimeCoord *XGetMotionEvents(dpy, w, start, stop, nEvents) diff --git a/src/GetNrmHint.c b/src/GetNrmHint.c index 741d1531..9dcb7c40 100644 --- a/src/GetNrmHint.c +++ b/src/GetNrmHint.c @@ -52,6 +52,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include "Xatomtype.h" diff --git a/src/GetPCnt.c b/src/GetPCnt.c index 457dc9bc..0883abad 100644 --- a/src/GetPCnt.c +++ b/src/GetPCnt.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetPCnt.c,v 1.3 2001/01/17 19:41:36 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/GetPntMap.c b/src/GetPntMap.c index 65a5215f..7a93ad79 100644 --- a/src/GetPntMap.c +++ b/src/GetPntMap.c @@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetPntMap.c,v 1.6 2001/12/14 19:54:01 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #ifdef MIN /* some systems define this in <sys/param.h> */ diff --git a/src/GetProp.c b/src/GetProp.c index 3323c778..af552570 100644 --- a/src/GetProp.c +++ b/src/GetProp.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetProp.c,v 1.5 2001/10/28 03:32:30 tsi Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/GetRGBCMap.c b/src/GetRGBCMap.c index bde36215..6657c539 100644 --- a/src/GetRGBCMap.c +++ b/src/GetRGBCMap.c @@ -28,6 +28,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "Xatomtype.h" diff --git a/src/GetSOwner.c b/src/GetSOwner.c index b9bacdfc..30d57023 100644 --- a/src/GetSOwner.c +++ b/src/GetSOwner.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Window XGetSelectionOwner(dpy, selection) diff --git a/src/GetSSaver.c b/src/GetSSaver.c index 1dc004d9..fc124eb5 100644 --- a/src/GetSSaver.c +++ b/src/GetSSaver.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/GetSSaver.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/GetStCmap.c b/src/GetStCmap.c index 0674bcb8..5c8c37e7 100644 --- a/src/GetStCmap.c +++ b/src/GetStCmap.c @@ -47,6 +47,9 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "Xatomtype.h" diff --git a/src/GetTxtProp.c b/src/GetTxtProp.c index bbd62851..0d447425 100644 --- a/src/GetTxtProp.c +++ b/src/GetTxtProp.c @@ -49,6 +49,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include <X11/Xutil.h> diff --git a/src/GetWAttrs.c b/src/GetWAttrs.c index 527675fc..05f1c112 100644 --- a/src/GetWAttrs.c +++ b/src/GetWAttrs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" typedef struct _WAttrsState { diff --git a/src/GetWMCMapW.c b/src/GetWMCMapW.c index 6c56a136..6d5c73c8 100644 --- a/src/GetWMCMapW.c +++ b/src/GetWMCMapW.c @@ -47,6 +47,9 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xatom.h> #include <stdio.h> diff --git a/src/GetWMProto.c b/src/GetWMProto.c index 84e79b60..9b244ce6 100644 --- a/src/GetWMProto.c +++ b/src/GetWMProto.c @@ -47,6 +47,9 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xatom.h> #include <stdio.h> diff --git a/src/GrButton.c b/src/GrButton.c index af642e9a..9bb8b853 100644 --- a/src/GrButton.c +++ b/src/GrButton.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/GrButton.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/GrKey.c b/src/GrKey.c index a1d5973f..ea636619 100644 --- a/src/GrKey.c +++ b/src/GrKey.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/GrKey.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/GrKeybd.c b/src/GrKeybd.c index 3f43f7ae..af587926 100644 --- a/src/GrKeybd.c +++ b/src/GrKeybd.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int XGrabKeyboard (dpy, window, ownerEvents, pointerMode, keyboardMode, time) register Display *dpy; diff --git a/src/GrPointer.c b/src/GrPointer.c index 544337a9..39351f42 100644 --- a/src/GrPointer.c +++ b/src/GrPointer.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int XGrabPointer(dpy, grab_window, owner_events, event_mask, pointer_mode, diff --git a/src/GrServer.c b/src/GrServer.c index df8cf3f2..bdb50513 100644 --- a/src/GrServer.c +++ b/src/GrServer.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/GrServer.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int @@ -1,5 +1,5 @@ /* $Xorg: Host.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ -/* $XdotOrg: lib/X11/src/Host.c,v 1.2 2004-04-23 18:43:24 eich Exp $ */ +/* $XdotOrg: lib/X11/src/Host.c,v 1.3 2005-05-13 22:53:43 sandmann Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -39,6 +39,9 @@ X Window System is a trademark of The Open Group. /* this might be rightly regarded an os dependent file */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/Iconify.c b/src/Iconify.c index b67b6602..62e57b84 100644 --- a/src/Iconify.c +++ b/src/Iconify.c @@ -51,6 +51,9 @@ from The Open Group. */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include <X11/Xos.h> diff --git a/src/IfEvent.c b/src/IfEvent.c index 57b792d8..55e7829c 100644 --- a/src/IfEvent.c +++ b/src/IfEvent.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/IfEvent.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/ImText.c b/src/ImText.c index c6cd2c04..4d2f147d 100644 --- a/src/ImText.c +++ b/src/ImText.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ImText.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ImText16.c b/src/ImText16.c index cabcf279..d0b5e9bc 100644 --- a/src/ImText16.c +++ b/src/ImText16.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ImText16.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ImUtil.c b/src/ImUtil.c index 446bef23..83fd030b 100644 --- a/src/ImUtil.c +++ b/src/ImUtil.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ImUtil.c,v 3.12 2003/04/15 22:10:06 herrb Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include <stdio.h> diff --git a/src/InitExt.c b/src/InitExt.c index 215ed7b3..67c86578 100644 --- a/src/InitExt.c +++ b/src/InitExt.c @@ -28,6 +28,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/InitExt.c,v 1.7 2001/12/14 19:54:02 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xos.h> #include <stdio.h> diff --git a/src/InsCmap.c b/src/InsCmap.c index df0dc9f7..26a86446 100644 --- a/src/InsCmap.c +++ b/src/InsCmap.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/InsCmap.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/IntAtom.c b/src/IntAtom.c index 00240fd9..8161c7f7 100644 --- a/src/IntAtom.c +++ b/src/IntAtom.c @@ -29,6 +29,9 @@ from The Open Group. /* $XFree86: xc/lib/X11/IntAtom.c,v 1.6 2001/12/14 19:54:02 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xintatom.h" diff --git a/src/KeyBind.c b/src/KeyBind.c index 1911b5a4..09488a3c 100644 --- a/src/KeyBind.c +++ b/src/KeyBind.c @@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group. /* Beware, here be monsters (still under construction... - JG */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #define XK_MISCELLANY diff --git a/src/KeysymStr.c b/src/KeysymStr.c index f3301e10..59aa3f32 100644 --- a/src/KeysymStr.c +++ b/src/KeysymStr.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/KeysymStr.c,v 3.9 2003/04/13 19:22:16 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xresource.h> #include <X11/keysymdef.h> diff --git a/src/KillCl.c b/src/KillCl.c index 6f05057c..4c2ddcfe 100644 --- a/src/KillCl.c +++ b/src/KillCl.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/KillCl.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/LiHosts.c b/src/LiHosts.c index 406c8550..a455b671 100644 --- a/src/LiHosts.c +++ b/src/LiHosts.c @@ -1,5 +1,5 @@ /* $Xorg: LiHosts.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ -/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.2 2004-04-23 18:43:24 eich Exp $ */ +/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.3 2005-05-13 22:53:44 sandmann Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -39,6 +39,9 @@ X Window System is a trademark of The Open Group. /* This can really be considered an os dependent routine */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* * can be freed using XFree. diff --git a/src/LiICmaps.c b/src/LiICmaps.c index 93a45025..c36fe55a 100644 --- a/src/LiICmaps.c +++ b/src/LiICmaps.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/LiICmaps.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Colormap *XListInstalledColormaps(dpy, win, n) diff --git a/src/LiProps.c b/src/LiProps.c index 346b8cac..5e3aba8c 100644 --- a/src/LiProps.c +++ b/src/LiProps.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/LiProps.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Atom *XListProperties(dpy, window, n_props) diff --git a/src/ListExt.c b/src/ListExt.c index e0a35c20..1140082e 100644 --- a/src/ListExt.c +++ b/src/ListExt.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ListExt.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" char **XListExtensions(dpy, nextensions) diff --git a/src/LoadFont.c b/src/LoadFont.c index bffdafe8..de5f5cee 100644 --- a/src/LoadFont.c +++ b/src/LoadFont.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/LoadFont.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Font diff --git a/src/LockDis.c b/src/LockDis.c index 96aabe45..d99d3bb6 100644 --- a/src/LockDis.c +++ b/src/LockDis.c @@ -33,6 +33,9 @@ in this Software without prior written authorization from The Open Group. * XLockDis.c - multi-thread application-level locking routines */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #ifdef XTHREADS #include "locking.h" diff --git a/src/LookupCol.c b/src/LookupCol.c index e68625e8..02f831a6 100644 --- a/src/LookupCol.c +++ b/src/LookupCol.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/LookupCol.c,v 1.6 2003/04/13 19:22:16 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/LowerWin.c b/src/LowerWin.c index 1a639deb..2db1e8ab 100644 --- a/src/LowerWin.c +++ b/src/LowerWin.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/LowerWin.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/Macros.c b/src/Macros.c index cc7c6172..34d11fea 100644 --- a/src/Macros.c +++ b/src/Macros.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Macros.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define XUTIL_DEFINE_FUNCTIONS #include "Xutil.h" diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 00000000..b3425695 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,548 @@ +SUBDIRS=util + +lib_LTLIBRARIES=libX11.la + +BUILT_SOURCES=ks_tables.h +CLEANFILES=ks_tables.h ks_tables_h + +AM_CFLAGS= \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/X11 \ + -I$(top_builddir)/include \ + -I$(top_builddir)/include/X11 \ + $(X11_CFLAGS) \ + $(BIGREQS_CFLAGS) \ + $(XDMCP_CFLAGS) \ + -DX11_DATADIR='"@X11_DATADIR@"' \ + -D_BSD_SOURCE + +libX11_la_LDFLAGS = -version-number 6:2:1 -no-undefined + +libX11_la_LIBADD = $(X11_LIBS) $(BIGREQS_LIBS) $(XDMCP_LIBS) + +XCMS_SRCS= \ + AddDIC.c \ + AddSF.c \ + CCC.c \ + CvColW.c \ + CvCols.c \ + Cv.h \ + HVC.c \ + HVCGcC.c \ + HVCGcV.c \ + HVCGcVC.c \ + HVCMnV.c \ + HVCMxC.c \ + HVCMxV.c \ + HVCMxVC.c \ + HVCMxVs.c \ + HVCWpAj.c \ + IdOfPr.c \ + LRGB.c \ + Lab.c \ + LabGcC.c \ + LabGcL.c \ + LabGcLC.c \ + LabMnL.c \ + LabMxC.c \ + LabMxL.c \ + LabMxLC.c \ + LabWpAj.c \ + Luv.c \ + LuvGcC.c \ + LuvGcL.c \ + LuvGcLC.c \ + LuvMnL.c \ + LuvMxC.c \ + LuvMxL.c \ + LuvMxLC.c \ + LuvWpAj.c \ + OfCCC.c \ + PrOfId.c \ + QBlack.c \ + QBlue.c \ + QGreen.c \ + QRed.c \ + QWhite.c \ + QuCol.c \ + QuCols.c \ + SetCCC.c \ + SetGetCols.c \ + StCol.c \ + StCols.c \ + UNDEFINED.c \ + XRGB.c \ + XYZ.c \ + cmsAllCol.c \ + cmsAllNCol.c \ + cmsCmap.c \ + cmsColNm.c \ + cmsGlobls.c \ + cmsInt.c \ + cmsLkCol.c \ + cmsMath.c \ + cmsProp.c \ + cmsTrig.c \ + uvY.c \ + xyY.c \ + Xcmsint.h + +XI18N_SRCS=\ + xim_trans.c \ + xim_trans.h \ + ICWrap.c \ + IMWrap.c \ + XDefaultIMIF.c \ + XDefaultOMIF.c \ + XlcDL.c \ + XlcSL.c \ + imCallbk.c \ + imConv.c \ + imDefFlt.c \ + imDefIc.c \ + imDefIm.c \ + imDefLkup.c \ + imDispch.c \ + imEvToWire.c \ + imExten.c \ + imImSw.c \ + imInsClbk.c \ + imInt.c \ + imKStoUCS.c \ + imLcFlt.c \ + imLcGIc.c \ + imLcIc.c \ + imLcIm.c \ + imLcLkup.c \ + imLcPrs.c \ + imLcSIc.c \ + imRm.c \ + imRmAttr.c \ + imThaiFlt.c \ + imThaiIc.c \ + imThaiIm.c \ + imTrX.c \ + imTrans.c \ + imTransR.c \ + lcCT.c \ + lcCharSet.c \ + lcConv.c \ + lcDB.c \ + lcDefConv.c \ + lcDynamic.c \ + lcEuc.c \ + lcFile.c \ + lcGenConv.c \ + lcGeneric.c \ + lcInit.c \ + lcJis.c \ + lcPrTxt.c \ + lcPubWrap.c \ + lcPublic.c \ + lcRM.c \ + lcSjis.c \ + lcStd.c \ + lcTxtPr.c \ + lcUTF8.c \ + lcUTF8Load.c \ + lcUtil.c \ + lcWrap.c \ + mbWMProps.c \ + mbWrap.c \ + omDefault.c \ + omGeneric.c \ + omImText.c \ + omText.c \ + omTextEsc.c \ + omTextExt.c \ + omTextPer.c \ + omXChar.c \ + utf8WMProps.c \ + utf8Wrap.c \ + wcWrap.c \ + Xaixlcint.h \ + XimImSw.h \ + XimProto.h \ + XimThai.h \ + XimTrInt.h \ + XimTrX.h \ + XimTrans.h \ + Ximint.h \ + XimintL.h \ + XimintP.h \ + XlcGeneric.h \ + XlcPubI.h \ + XlcPublic.h \ + Xlcint.h \ + lcUniConv/armscii_8.h \ + lcUniConv/ascii.h \ + lcUniConv/big5.h \ + lcUniConv/big5_emacs.h \ + lcUniConv/cp1133.h \ + lcUniConv/cp1251.h \ + lcUniConv/cp1255.h \ + lcUniConv/cp1256.h \ + lcUniConv/gb2312.h \ + lcUniConv/georgian_academy.h \ + lcUniConv/georgian_ps.h \ + lcUniConv/iso8859_1.h \ + lcUniConv/iso8859_10.h \ + lcUniConv/iso8859_11.h \ + lcUniConv/iso8859_13.h \ + lcUniConv/iso8859_14.h \ + lcUniConv/iso8859_15.h \ + lcUniConv/iso8859_16.h \ + lcUniConv/iso8859_2.h \ + lcUniConv/iso8859_3.h \ + lcUniConv/iso8859_4.h \ + lcUniConv/iso8859_5.h \ + lcUniConv/iso8859_6.h \ + lcUniConv/iso8859_7.h \ + lcUniConv/iso8859_8.h \ + lcUniConv/iso8859_9.h \ + lcUniConv/iso8859_9e.h \ + lcUniConv/jisx0201.h \ + lcUniConv/jisx0208.h \ + lcUniConv/jisx0212.h \ + lcUniConv/koi8_c.h \ + lcUniConv/koi8_r.h \ + lcUniConv/koi8_u.h \ + lcUniConv/ksc5601.h \ + lcUniConv/mulelao.h \ + lcUniConv/tatar_cyr.h \ + lcUniConv/tcvn.h \ + lcUniConv/tis620.h \ + lcUniConv/ucs2be.h \ + lcUniConv/utf8.h \ + lcUniConv/viscii.h + +X11_SRCS= \ + AllCells.c \ + AllPlanes.c \ + AutoRep.c \ + BdrWidth.c \ + Border.c \ + ChAccCon.c \ + ChCmap.c \ + ChGC.c \ + ChKeyCon.c \ + ChProp.c \ + ChWAttrs.c \ + ChkIfEv.c \ + ChkMaskEv.c \ + ChkTypEv.c \ + ChkTypWEv.c \ + ChkWinEv.c \ + CirWin.c \ + CirWinDn.c \ + CirWinUp.c \ + ClDisplay.c \ + Context.c \ + CopyCmap.c \ + CopyGC.c \ + CrBFData.c \ + CrCmap.c \ + CrCursor.c \ + CrGC.c \ + CrGlCur.c \ + CrPFBData.c \ + ChSaveSet.c \ + CrWindow.c \ + Cursor.c \ + Depths.c \ + DisName.c \ + DrArc.c \ + DrArcs.c \ + DrLines.c \ + DrPoints.c \ + DrRect.c \ + DrRects.c \ + DrSegs.c \ + ErrDes.c \ + ErrHndlr.c \ + EvToWire.c \ + FSSaver.c \ + FSWrap.c \ + FetchName.c \ + FillArc.c \ + FillArcs.c \ + FillRct.c \ + FillRcts.c \ + FilterEv.c \ + Flush.c \ + Font.c \ + FontInfo.c \ + FontNames.c \ + FreeEData.c \ + FreeGC.c \ + GCMisc.c \ + Geom.c \ + GetAtomNm.c \ + GetColor.c \ + GetDflt.c \ + GetFPath.c \ + GetFProp.c \ + GetGCVals.c \ + GetGeom.c \ + GetHColor.c \ + GetHints.c \ + GetIFocus.c \ + GetImage.c \ + GetKCnt.c \ + GetMoEv.c \ + GetNrmHint.c \ + GetPCnt.c \ + GetPntMap.c \ + GetProp.c \ + GetRGBCMap.c \ + GetSOwner.c \ + GetSSaver.c \ + GetStCmap.c \ + GetTxtProp.c \ + GetWAttrs.c \ + GetWMCMapW.c \ + GetWMProto.c \ + GrKeybd.c \ + GrPointer.c \ + Host.c \ + Iconify.c \ + IfEvent.c \ + ImText.c \ + ImText16.c \ + ImUtil.c \ + ImUtil.h \ + InitExt.c \ + IntAtom.c \ + KeyBind.c \ + KeysymStr.c \ + LiHosts.c \ + LiICmaps.c \ + LiProps.c \ + ListExt.c \ + LoadFont.c \ + LookupCol.c \ + LowerWin.c \ + Macros.c \ + MapRaised.c \ + MaskEvent.c \ + Misc.c \ + ModMap.c \ + NextEvent.c \ + OCWrap.c \ + OMWrap.c \ + OpenDis.c \ + ParseCmd.c \ + ParseCol.c \ + ParseGeom.c \ + PeekEvent.c \ + PeekIfEv.c \ + Pending.c \ + PixFormats.c \ + PmapBord.c \ + PolyReg.c \ + PolyTxt.c \ + PolyTxt16.c \ + PropAlloc.c \ + PutBEvent.c \ + PutImage.c \ + QuBest.c \ + QuColor.c \ + QuColors.c \ + QuCurShp.c \ + QuExt.c \ + QuKeybd.c \ + QuPntr.c \ + QuStipShp.c \ + QuTextE16.c \ + QuTextExt.c \ + QuTileShp.c \ + QuTree.c \ + Quarks.c \ + RaiseWin.c \ + RdBitF.c \ + RecolorC.c \ + ReconfWM.c \ + ReconfWin.c \ + Region.c \ + RegstFlt.c \ + RestackWs.c \ + RotProp.c \ + ScrResStr.c \ + SendEvent.c \ + SetBack.c \ + SetCRects.c \ + SetClMask.c \ + SetClOrig.c \ + SetDashes.c \ + SetFPath.c \ + SetFont.c \ + SetFore.c \ + SetFunc.c \ + SetHints.c \ + SetLStyle.c \ + SetLocale.c \ + SetNrmHint.c \ + SetPMask.c \ + SetPntMap.c \ + SetRGBCMap.c \ + SetStCmap.c \ + SetState.c \ + SetStip.c \ + SetTSOrig.c \ + SetTile.c \ + SetTxtProp.c \ + SetWMCMapW.c \ + SetWMProto.c \ + StBytes.c \ + StColor.c \ + StColors.c \ + StNColor.c \ + StName.c \ + StrKeysym.c \ + StrToText.c \ + Sync.c \ + Synchro.c \ + Text.c \ + Text16.c \ + TextExt.c \ + TextExt16.c \ + TextToStr.c \ + TrCoords.c \ + UndefCurs.c \ + VisUtil.c \ + WMGeom.c \ + WMProps.c \ + WinEvent.c \ + Window.c \ + Withdraw.c \ + WrBitF.c \ + XlibAsync.c \ + XlibInt.c \ + Xrm.c \ + evtomask.c \ + globals.c \ + locking.c \ + Cr.h \ + Key.h \ + Xatomtype.h \ + Xintatom.h \ + Xintconn.h \ + XomGeneric.h \ + Xresinternal.h \ + XrmI.h \ + locking.h \ + poly.h + +x11datadir = @X11_DATADIR@ + +x11data_DATA = XKeysymDB XErrorDB + +EXTRA_DIST = \ + $(X11_SRCS) \ + $(XI18N_SRCS) \ + $(XCMS_SRCS) \ + X18NCMSstubs.c \ + $(x11data_DATA) + +libX11_la_SOURCES = $(X11_SRCS) + +libX11_la_SOURCES += \ + ConnDis.c \ + LockDis.c \ + AllowEv.c \ + Backgnd.c \ + Bell.c \ + ChActPGb.c \ + ChClMode.c \ + ChPntCon.c \ + ChWindow.c \ + Clear.c \ + ClearArea.c \ + ConfWind.c \ + ConvSel.c \ + CopyArea.c \ + CopyPlane.c \ + CrPixmap.c \ + DefCursor.c \ + DelProp.c \ + DestSubs.c \ + DestWind.c \ + DrLine.c \ + DrPoint.c \ + FillPoly.c \ + FreeCmap.c \ + FreeCols.c \ + FreeCurs.c \ + FreePix.c \ + GrButton.c \ + GrKey.c \ + GrServer.c \ + InsCmap.c \ + KillCl.c \ + MapSubs.c \ + MapWindow.c \ + MoveWin.c \ + PmapBgnd.c \ + RepWindow.c \ + SelInput.c \ + SetIFocus.c \ + SetSOwner.c \ + SetSSaver.c \ + UngrabBut.c \ + UngrabKbd.c \ + UngrabKey.c \ + UngrabPtr.c \ + UngrabSvr.c \ + UninsCmap.c \ + UnldFont.c \ + UnmapSubs.c \ + UnmapWin.c \ + WarpPtr.c \ + x11_trans.c \ + x11_trans.h + +if DISABLE_XLOCALE +libX11_la_SOURCES+= X18NCMSstubs.c +else +libX11_la_SOURCES+= $(XI18N_SRCS) +endif + +if DISABLE_XCMS +if !DISABLE_XLOCALE +libX11_la_SOURCES+= X18NCMSstubs.c +endif +else +libX11_la_SOURCES+= $(XCMS_SRCS) +endif + +if OS2 +libX11_la_SOURCES+=os2Stubs.c +endif OS2 + +if UDC +libX11_la_SOURCES+=udcInf.c +endif + +if XKB +libX11_la_SOURCES+=XKB.c XKBBind.c XKBCompat.c XKBCtrls.c XKBCvt.c XKBGetMap.c \ + XKBGetByName.c XKBNames.c XKBRdBuf.c XKBSetMap.c XKBUse.c \ + XKBleds.c XKBBell.c XKBGeom.c XKBSetGeom.c XKBExtDev.c \ + XKBList.c XKBMisc.c \ + XKBMAlloc.c XKBGAlloc.c XKBAlloc.c \ + XKBlibint.h +endif XKB + +preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES)) +.c.ii: + $(COMPILE) -E -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +KEYSYMDEF=@KEYSYMDEF@ + +ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT) + $(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h + mv ks_tables_h $@ + +$(top_builddir)/src/util/makekeys$(EXEEXT): force + cd util; $(MAKE) + +force: diff --git a/src/MapRaised.c b/src/MapRaised.c index fc98179d..444c99d1 100644 --- a/src/MapRaised.c +++ b/src/MapRaised.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/MapRaised.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/MapSubs.c b/src/MapSubs.c index 8c07b7d5..f3e11ebd 100644 --- a/src/MapSubs.c +++ b/src/MapSubs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/MapSubs.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/MapWindow.c b/src/MapWindow.c index 5258fd91..d40bff2b 100644 --- a/src/MapWindow.c +++ b/src/MapWindow.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/MapWindow.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/MaskEvent.c b/src/MaskEvent.c index 94db3ae2..c5f41b54 100644 --- a/src/MaskEvent.c +++ b/src/MaskEvent.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/MaskEvent.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" extern long const _Xevent_to_mask[]; @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Misc.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" long XMaxRequestSize(dpy) diff --git a/src/ModMap.c b/src/ModMap.c index 8740bd82..f321c81b 100644 --- a/src/ModMap.c +++ b/src/ModMap.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ModMap.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" XModifierKeymap * diff --git a/src/MoveWin.c b/src/MoveWin.c index c693065b..d3c4f882 100644 --- a/src/MoveWin.c +++ b/src/MoveWin.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/MoveWin.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/NextEvent.c b/src/NextEvent.c index 82805b57..1c908065 100644 --- a/src/NextEvent.c +++ b/src/NextEvent.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/NextEvent.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/OCWrap.c b/src/OCWrap.c index bd74f1e1..63ffc421 100644 --- a/src/OCWrap.c +++ b/src/OCWrap.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/OCWrap.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/OMWrap.c b/src/OMWrap.c index 988b63a5..8f8a1fd9 100644 --- a/src/OMWrap.c +++ b/src/OMWrap.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/OMWrap.c,v 1.4 2001/07/25 15:04:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/OpenDis.c b/src/OpenDis.c index ea37260a..702698e6 100644 --- a/src/OpenDis.c +++ b/src/OpenDis.c @@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xtrans.h> #include <X11/Xatom.h> diff --git a/src/ParseCmd.c b/src/ParseCmd.c index 7fd54246..ddcbf784 100644 --- a/src/ParseCmd.c +++ b/src/ParseCmd.c @@ -57,6 +57,9 @@ SOFTWARE. other options appearing before the longer version in the table. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xresource.h> #include <stdio.h> diff --git a/src/ParseCol.c b/src/ParseCol.c index 018f79e1..3736fada 100644 --- a/src/ParseCol.c +++ b/src/ParseCol.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/ParseCol.c,v 1.6 2003/04/13 19:22:17 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/ParseGeom.c b/src/ParseGeom.c index c00dc21a..6aaaccf0 100644 --- a/src/ParseGeom.c +++ b/src/ParseGeom.c @@ -29,6 +29,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/ParseGeom.c,v 1.3 2001/12/14 19:54:03 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" diff --git a/src/PeekEvent.c b/src/PeekEvent.c index 4e2a61df..b89c6c95 100644 --- a/src/PeekEvent.c +++ b/src/PeekEvent.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/PeekEvent.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c index 313c6981..beb991a0 100644 --- a/src/PeekIfEv.c +++ b/src/PeekIfEv.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/PeekIfEv.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/Pending.c b/src/Pending.c index 55e5e71b..480ec6cf 100644 --- a/src/Pending.c +++ b/src/Pending.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* Read in pending events if needed and return the number of queued events. */ diff --git a/src/PixFormats.c b/src/PixFormats.c index a8b74b1e..dc3a2387 100644 --- a/src/PixFormats.c +++ b/src/PixFormats.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <stdio.h> diff --git a/src/PmapBgnd.c b/src/PmapBgnd.c index 18931949..3333cd96 100644 --- a/src/PmapBgnd.c +++ b/src/PmapBgnd.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/PmapBgnd.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/PmapBord.c b/src/PmapBord.c index cd5fc6c9..a81adc13 100644 --- a/src/PmapBord.c +++ b/src/PmapBord.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/PmapBord.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/PolyReg.c b/src/PolyReg.c index 90bec77e..79c38874 100644 --- a/src/PolyReg.c +++ b/src/PolyReg.c @@ -50,6 +50,9 @@ SOFTWARE. #define LARGE_COORDINATE 1000000 #define SMALL_COORDINATE -LARGE_COORDINATE +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" #include "region.h" diff --git a/src/PolyTxt.c b/src/PolyTxt.c index bd885266..f66b1046 100644 --- a/src/PolyTxt.c +++ b/src/PolyTxt.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/PolyTxt.c,v 3.5 2001/10/28 03:32:30 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/PolyTxt16.c b/src/PolyTxt16.c index c7dce509..ddaa62d0 100644 --- a/src/PolyTxt16.c +++ b/src/PolyTxt16.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/PolyTxt16.c,v 1.4 2001/10/28 03:32:31 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/PropAlloc.c b/src/PropAlloc.c index 96c92bbf..9005a24f 100644 --- a/src/PropAlloc.c +++ b/src/PropAlloc.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/PropAlloc.c,v 1.3 2001/01/17 19:41:41 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" #include <stdio.h> diff --git a/src/PutBEvent.c b/src/PutBEvent.c index c8499360..8c1db72a 100644 --- a/src/PutBEvent.c +++ b/src/PutBEvent.c @@ -30,6 +30,9 @@ from The Open Group. /* XPutBackEvent puts an event back at the head of the queue. */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/PutImage.c b/src/PutImage.c index 415255a2..b4402940 100644 --- a/src/PutImage.c +++ b/src/PutImage.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/PutImage.c,v 3.11 2002/12/09 04:10:56 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" #include <stdio.h> diff --git a/src/QuBest.c b/src/QuBest.c index ac857af4..7fe21814 100644 --- a/src/QuBest.c +++ b/src/QuBest.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XQueryBestSize(dpy, class, drawable, width, height, ret_width, ret_height) diff --git a/src/QuColor.c b/src/QuColor.c index d7da47e8..9b6901e8 100644 --- a/src/QuColor.c +++ b/src/QuColor.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/QuColor.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/QuColors.c b/src/QuColors.c index 1603a56f..74a1de85 100644 --- a/src/QuColors.c +++ b/src/QuColors.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/QuColors.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/QuCurShp.c b/src/QuCurShp.c index 3dd42be1..b2667231 100644 --- a/src/QuCurShp.c +++ b/src/QuCurShp.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XQueryBestCursor(dpy, drawable, width, height, ret_width, ret_height) diff --git a/src/QuExt.c b/src/QuExt.c index 686334e0..19d8be5d 100644 --- a/src/QuExt.c +++ b/src/QuExt.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86$ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Bool diff --git a/src/QuKeybd.c b/src/QuKeybd.c index 4a7b8fba..62691c04 100644 --- a/src/QuKeybd.c +++ b/src/QuKeybd.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/QuKeybd.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" struct kmap { diff --git a/src/QuPntr.c b/src/QuPntr.c index d0b04c1b..006553d7 100644 --- a/src/QuPntr.c +++ b/src/QuPntr.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Bool XQueryPointer(dpy, w, root, child, root_x, root_y, win_x, win_y, mask) diff --git a/src/QuStipShp.c b/src/QuStipShp.c index 81996fc4..0d7c00d7 100644 --- a/src/QuStipShp.c +++ b/src/QuStipShp.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XQueryBestStipple(dpy, drawable, width, height, ret_width, ret_height) diff --git a/src/QuTextE16.c b/src/QuTextE16.c index 58003f49..ee381727 100644 --- a/src/QuTextE16.c +++ b/src/QuTextE16.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/QuTextE16.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/QuTextExt.c b/src/QuTextExt.c index 3ab18138..a144865c 100644 --- a/src/QuTextExt.c +++ b/src/QuTextExt.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/QuTextExt.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/QuTileShp.c b/src/QuTileShp.c index 1c15d17b..5e23ae2f 100644 --- a/src/QuTileShp.c +++ b/src/QuTileShp.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XQueryBestTile(dpy, drawable, width, height, ret_width, ret_height) diff --git a/src/QuTree.c b/src/QuTree.c index bb7307a1..1a743284 100644 --- a/src/QuTree.c +++ b/src/QuTree.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/QuTree.c,v 1.5 2001/01/17 19:41:42 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Status XQueryTree (dpy, w, root, parent, children, nchildren) diff --git a/src/Quarks.c b/src/Quarks.c index 70f6f492..a5ffa8ac 100644 --- a/src/Quarks.c +++ b/src/Quarks.c @@ -51,6 +51,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/Quarks.c,v 1.6 2003/04/13 19:22:17 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xresource.h> #include "Xresinternal.h" diff --git a/src/RaiseWin.c b/src/RaiseWin.c index a11aed8b..15d03fac 100644 --- a/src/RaiseWin.c +++ b/src/RaiseWin.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/RaiseWin.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/RdBitF.c b/src/RdBitF.c index b2826966..198e0e4a 100644 --- a/src/RdBitF.c +++ b/src/RdBitF.c @@ -43,6 +43,9 @@ from The Open Group. * without the other). */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xos.h> #include "Xutil.h" diff --git a/src/RecolorC.c b/src/RecolorC.c index 3066d1ad..0bd46d61 100644 --- a/src/RecolorC.c +++ b/src/RecolorC.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/RecolorC.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ReconfWM.c b/src/ReconfWM.c index c1a6cfb6..ecb5f6a8 100644 --- a/src/ReconfWM.c +++ b/src/ReconfWM.c @@ -29,6 +29,9 @@ from The Open Group. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\ diff --git a/src/ReconfWin.c b/src/ReconfWin.c index ef536ff3..1aaa652d 100644 --- a/src/ReconfWin.c +++ b/src/ReconfWin.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/ReconfWin.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\ diff --git a/src/Region.c b/src/Region.c index 79fb8e8b..a61220e0 100644 --- a/src/Region.c +++ b/src/Region.c @@ -72,6 +72,9 @@ SOFTWARE. * the y-x-banding that's so nice to have... */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" #include "region.h" diff --git a/src/RegstFlt.c b/src/RegstFlt.c index e3702bae..0648a54d 100644 --- a/src/RegstFlt.c +++ b/src/RegstFlt.c @@ -54,6 +54,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/RegstFlt.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/RepWindow.c b/src/RepWindow.c index 2193220d..b30340e0 100644 --- a/src/RepWindow.c +++ b/src/RepWindow.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/RepWindow.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/RestackWs.c b/src/RestackWs.c index 8060f17a..1887e7c7 100644 --- a/src/RestackWs.c +++ b/src/RestackWs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/RestackWs.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/RotProp.c b/src/RotProp.c index 4020606f..a8f81195 100644 --- a/src/RotProp.c +++ b/src/RotProp.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/RotProp.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/ScrResStr.c b/src/ScrResStr.c index bd996871..89f77178 100644 --- a/src/ScrResStr.c +++ b/src/ScrResStr.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xatom.h> diff --git a/src/SelInput.c b/src/SelInput.c index 5a8870e4..e517a5c6 100644 --- a/src/SelInput.c +++ b/src/SelInput.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SelInput.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SendEvent.c b/src/SendEvent.c index 6d7d6229..06e23a5c 100644 --- a/src/SendEvent.c +++ b/src/SendEvent.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/SendEvent.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* diff --git a/src/SetBack.c b/src/SetBack.c index 6c207f7d..037933f1 100644 --- a/src/SetBack.c +++ b/src/SetBack.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetBack.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetCRects.c b/src/SetCRects.c index 194998c3..a8dcf664 100644 --- a/src/SetCRects.c +++ b/src/SetCRects.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetCRects.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* can only call when display is locked. */ diff --git a/src/SetClMask.c b/src/SetClMask.c index 2503aef5..f9fb051f 100644 --- a/src/SetClMask.c +++ b/src/SetClMask.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetClMask.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetClOrig.c b/src/SetClOrig.c index 659c9a8a..60f0346e 100644 --- a/src/SetClOrig.c +++ b/src/SetClOrig.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetClOrig.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetDashes.c b/src/SetDashes.c index 9fd0472f..6ecf955d 100644 --- a/src/SetDashes.c +++ b/src/SetDashes.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetDashes.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetFPath.c b/src/SetFPath.c index 09441df0..086c657d 100644 --- a/src/SetFPath.c +++ b/src/SetFPath.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetFPath.c,v 1.5 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define safestrlen(s) ((s) ? strlen(s) : 0) diff --git a/src/SetFont.c b/src/SetFont.c index 9a8e67db..089960d7 100644 --- a/src/SetFont.c +++ b/src/SetFont.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetFont.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetFore.c b/src/SetFore.c index e938d8fa..62ffb8fd 100644 --- a/src/SetFore.c +++ b/src/SetFore.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetFore.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetFunc.c b/src/SetFunc.c index c0041317..a253266d 100644 --- a/src/SetFunc.c +++ b/src/SetFunc.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetFunc.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetHints.c b/src/SetHints.c index ffa5ebe9..5ee34435 100644 --- a/src/SetHints.c +++ b/src/SetHints.c @@ -48,6 +48,9 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/lib/X11/SetHints.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "Xatomtype.h" diff --git a/src/SetIFocus.c b/src/SetIFocus.c index 2e0eb1d9..4f42908f 100644 --- a/src/SetIFocus.c +++ b/src/SetIFocus.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetIFocus.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetLStyle.c b/src/SetLStyle.c index 9f0c8c5e..74233d0b 100644 --- a/src/SetLStyle.c +++ b/src/SetLStyle.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetLStyle.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetLocale.c b/src/SetLocale.c index 49ec0d32..c24a381c 100644 --- a/src/SetLocale.c +++ b/src/SetLocale.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.2 2004-04-23 18:43:24 eich Exp $ */ +/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.3 2005-05-13 22:53:44 sandmann Exp $ */ /* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* @@ -58,6 +58,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/SetLocale.c,v 3.20 2003/11/17 22:20:08 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include <X11/Xlocale.h> diff --git a/src/SetNrmHint.c b/src/SetNrmHint.c index d8511a6f..64b0ef7f 100644 --- a/src/SetNrmHint.c +++ b/src/SetNrmHint.c @@ -51,6 +51,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "Xatomtype.h" diff --git a/src/SetPMask.c b/src/SetPMask.c index 6c4b826c..268ef4fd 100644 --- a/src/SetPMask.c +++ b/src/SetPMask.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetPMask.c,v 1.3 2001/01/17 19:41:43 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetPntMap.c b/src/SetPntMap.c index 7942537b..4a98ad48 100644 --- a/src/SetPntMap.c +++ b/src/SetPntMap.c @@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group. #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* returns either DeviceMappingSuccess or DeviceMappingBusy */ diff --git a/src/SetRGBCMap.c b/src/SetRGBCMap.c index 0523f0ba..4be840b7 100644 --- a/src/SetRGBCMap.c +++ b/src/SetRGBCMap.c @@ -28,6 +28,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "Xatomtype.h" diff --git a/src/SetSOwner.c b/src/SetSOwner.c index 40481ded..f692cce7 100644 --- a/src/SetSOwner.c +++ b/src/SetSOwner.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetSOwner.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetSSaver.c b/src/SetSSaver.c index cea64f25..43fd4dfa 100644 --- a/src/SetSSaver.c +++ b/src/SetSSaver.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetSSaver.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetStCmap.c b/src/SetStCmap.c index 86ff4c8e..b5a93e36 100644 --- a/src/SetStCmap.c +++ b/src/SetStCmap.c @@ -47,6 +47,9 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "Xatomtype.h" diff --git a/src/SetState.c b/src/SetState.c index ecd51901..a13f11bf 100644 --- a/src/SetState.c +++ b/src/SetState.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetState.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetStip.c b/src/SetStip.c index cb2ed999..41ebdad2 100644 --- a/src/SetStip.c +++ b/src/SetStip.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetStip.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetTSOrig.c b/src/SetTSOrig.c index d72e5cae..c75707ed 100644 --- a/src/SetTSOrig.c +++ b/src/SetTSOrig.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetTSOrig.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetTile.c b/src/SetTile.c index 58ba8d90..d9ca8115 100644 --- a/src/SetTile.c +++ b/src/SetTile.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/SetTile.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/SetTxtProp.c b/src/SetTxtProp.c index 73bee7e1..a82d9b3e 100644 --- a/src/SetTxtProp.c +++ b/src/SetTxtProp.c @@ -49,6 +49,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include <X11/Xutil.h> diff --git a/src/SetWMCMapW.c b/src/SetWMCMapW.c index bf56a023..dd88061d 100644 --- a/src/SetWMCMapW.c +++ b/src/SetWMCMapW.c @@ -47,6 +47,9 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xatom.h> diff --git a/src/SetWMProto.c b/src/SetWMProto.c index 15ebd76a..8640e506 100644 --- a/src/SetWMProto.c +++ b/src/SetWMProto.c @@ -47,6 +47,9 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xatom.h> diff --git a/src/StBytes.c b/src/StBytes.c index 5daa3536..b2390258 100644 --- a/src/StBytes.c +++ b/src/StBytes.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/StBytes.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> diff --git a/src/StColor.c b/src/StColor.c index 10387873..b2b197a9 100644 --- a/src/StColor.c +++ b/src/StColor.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/StColor.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/StColors.c b/src/StColors.c index 3ad030fa..16d634bf 100644 --- a/src/StColors.c +++ b/src/StColors.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/StColors.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/StNColor.c b/src/StNColor.c index 0ffbdc12..f7dbcb06 100644 --- a/src/StNColor.c +++ b/src/StNColor.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/StNColor.c,v 1.5 2003/04/13 19:22:18 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/StName.c b/src/StName.c index 051bdda4..ba01ffb0 100644 --- a/src/StName.c +++ b/src/StName.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/StName.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> diff --git a/src/StrKeysym.c b/src/StrKeysym.c index 8cb2cd51..b6874d37 100644 --- a/src/StrKeysym.c +++ b/src/StrKeysym.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/StrKeysym.c,v 3.7 2003/04/13 19:22:18 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xresource.h> #include <X11/keysymdef.h> diff --git a/src/StrToText.c b/src/StrToText.c index c84c0714..ba894e16 100644 --- a/src/StrToText.c +++ b/src/StrToText.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include <X11/Xutil.h> @@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" /* Synchronize with errors and events, optionally discarding pending events */ diff --git a/src/Synchro.c b/src/Synchro.c index 8c84f504..2688e79c 100644 --- a/src/Synchro.c +++ b/src/Synchro.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Synchro.c,v 1.3 2003/04/13 19:22:18 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Text.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/Text16.c b/src/Text16.c index 2eee708b..96d5911d 100644 --- a/src/Text16.c +++ b/src/Text16.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Text16.c,v 1.5 2001/12/14 19:54:07 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/TextExt.c b/src/TextExt.c index 1e6b1dce..fc703011 100644 --- a/src/TextExt.c +++ b/src/TextExt.c @@ -34,6 +34,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define min_byte2 min_char_or_byte2 diff --git a/src/TextExt16.c b/src/TextExt16.c index 9b4899cb..763350a1 100644 --- a/src/TextExt16.c +++ b/src/TextExt16.c @@ -34,6 +34,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #define min_byte2 min_char_or_byte2 diff --git a/src/TextToStr.c b/src/TextToStr.c index c775fa6e..0bea8096 100644 --- a/src/TextToStr.c +++ b/src/TextToStr.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/TextToStr.c,v 1.4 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include <X11/Xutil.h> diff --git a/src/TrCoords.c b/src/TrCoords.c index 2363248d..87ae4ae4 100644 --- a/src/TrCoords.c +++ b/src/TrCoords.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" Bool XTranslateCoordinates(dpy, src_win, dest_win, src_x, src_y, diff --git a/src/UIThrStubs.c b/src/UIThrStubs.c index 27df98fd..13df9e7c 100644 --- a/src/UIThrStubs.c +++ b/src/UIThrStubs.c @@ -49,6 +49,9 @@ */ #ifdef CTHREADS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <cthreads.h> typedef cthread_t xthread_t; #define xthread_self cthread_self diff --git a/src/UndefCurs.c b/src/UndefCurs.c index ced35187..6382a833 100644 --- a/src/UndefCurs.c +++ b/src/UndefCurs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UndefCurs.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UngrabBut.c b/src/UngrabBut.c index 4f1e12d0..82b17910 100644 --- a/src/UngrabBut.c +++ b/src/UngrabBut.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UngrabBut.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UngrabKbd.c b/src/UngrabKbd.c index b4720a49..03d24b93 100644 --- a/src/UngrabKbd.c +++ b/src/UngrabKbd.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UngrabKbd.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UngrabKey.c b/src/UngrabKey.c index 4f001d2e..66c691f9 100644 --- a/src/UngrabKey.c +++ b/src/UngrabKey.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UngrabKey.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UngrabPtr.c b/src/UngrabPtr.c index 1d6a02ea..42890ff8 100644 --- a/src/UngrabPtr.c +++ b/src/UngrabPtr.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UngrabPtr.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UngrabSvr.c b/src/UngrabSvr.c index 6ec8ccef..19764f65 100644 --- a/src/UngrabSvr.c +++ b/src/UngrabSvr.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UngrabSvr.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UninsCmap.c b/src/UninsCmap.c index cd9af166..9a3d998b 100644 --- a/src/UninsCmap.c +++ b/src/UninsCmap.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UninsCmap.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UnldFont.c b/src/UnldFont.c index aafd9041..f90291e6 100644 --- a/src/UnldFont.c +++ b/src/UnldFont.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UnldFont.c,v 1.5 2001/12/14 19:54:07 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UnmapSubs.c b/src/UnmapSubs.c index 56e30b7e..503a6c9e 100644 --- a/src/UnmapSubs.c +++ b/src/UnmapSubs.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UnmapSubs.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/UnmapWin.c b/src/UnmapWin.c index da0e895c..1a9cc0c2 100644 --- a/src/UnmapWin.c +++ b/src/UnmapWin.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/UnmapWin.c,v 1.3 2001/01/17 19:41:45 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/VisUtil.c b/src/VisUtil.c index 92cdd93f..304317ae 100644 --- a/src/VisUtil.c +++ b/src/VisUtil.c @@ -25,6 +25,9 @@ in this Software without prior written authorization from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" #include <stdio.h> diff --git a/src/WMGeom.c b/src/WMGeom.c index 7eb945f7..59041a9f 100644 --- a/src/WMGeom.c +++ b/src/WMGeom.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/WMGeom.c,v 1.3 2003/04/13 19:22:18 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xutil.h" diff --git a/src/WMProps.c b/src/WMProps.c index 6e4e474c..62c6a8d1 100644 --- a/src/WMProps.c +++ b/src/WMProps.c @@ -52,6 +52,9 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include <X11/Xutil.h> diff --git a/src/WarpPtr.c b/src/WarpPtr.c index e83a7e2a..545cc064 100644 --- a/src/WarpPtr.c +++ b/src/WarpPtr.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/WarpPtr.c,v 1.3 2001/01/17 19:41:47 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" int diff --git a/src/WinEvent.c b/src/WinEvent.c index d69a6671..67e825cb 100644 --- a/src/WinEvent.c +++ b/src/WinEvent.c @@ -27,6 +27,9 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/lib/X11/WinEvent.c,v 3.5 2001/10/28 03:32:32 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" extern long const _Xevent_to_mask[]; diff --git a/src/Window.c b/src/Window.c index 05628369..10d1b95f 100644 --- a/src/Window.c +++ b/src/Window.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/Window.c,v 1.4 2001/12/14 19:54:08 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" void _XProcessWindowAttributes ( diff --git a/src/Withdraw.c b/src/Withdraw.c index e9735a9b..1b771c28 100644 --- a/src/Withdraw.c +++ b/src/Withdraw.c @@ -51,6 +51,9 @@ from The Open Group. */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xatom.h> #include <X11/Xos.h> diff --git a/src/WrBitF.c b/src/WrBitF.c index f57bd930..d8c9f18f 100644 --- a/src/WrBitF.c +++ b/src/WrBitF.c @@ -28,6 +28,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/WrBitF.c,v 3.6 2003/04/13 19:22:18 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xos.h> #include "Xutil.h" diff --git a/src/XlibAsync.c b/src/XlibAsync.c index 066e12e7..a0314ba8 100644 --- a/src/XlibAsync.c +++ b/src/XlibAsync.c @@ -28,6 +28,9 @@ from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xos.h> diff --git a/src/XlibInt.c b/src/XlibInt.c index 17ed4cce..b5770d95 100644 --- a/src/XlibInt.c +++ b/src/XlibInt.c @@ -38,6 +38,9 @@ from The Open Group. #ifdef WIN32 #define _XLIBINT_ #endif +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/Xpoll.h> #include <X11/Xtrans.h> @@ -51,6 +51,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/Xrm.c,v 3.22 2003/07/16 01:38:26 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <ctype.h> #include "Xlibint.h" diff --git a/src/bigreqstr.h b/src/bigreqstr.h new file mode 100644 index 00000000..dc333095 --- /dev/null +++ b/src/bigreqstr.h @@ -0,0 +1 @@ +#include <X11/extensions/bigreqstr.h> diff --git a/src/evtomask.c b/src/evtomask.c index 1ce018cd..fbbb998d 100644 --- a/src/evtomask.c +++ b/src/evtomask.c @@ -26,6 +26,9 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/lib/X11/evtomask.c,v 3.4 2001/07/29 05:01:11 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/X.h> /* diff --git a/src/globals.c b/src/globals.c index 0fa860dc..11965cb5 100644 --- a/src/globals.c +++ b/src/globals.c @@ -35,6 +35,9 @@ from The Open Group. * This file should contain only those objects which must be predefined. */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> diff --git a/src/imConv.c b/src/imConv.c index e0015716..f519401e 100644 --- a/src/imConv.c +++ b/src/imConv.c @@ -36,6 +36,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/lib/X11/imConv.c,v 1.32 2003/04/13 19:22:20 dawes Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/locking.c b/src/locking.c index 3508dea8..5312b5d2 100644 --- a/src/locking.c +++ b/src/locking.c @@ -32,6 +32,9 @@ in this Software without prior written authorization from The Open Group. * locking.c - multi-thread locking routines implemented in C Threads */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #undef _XLockMutex #undef _XUnlockMutex diff --git a/src/os2Stubs.c b/src/os2Stubs.c index 4fa953cf..9d109025 100644 --- a/src/os2Stubs.c +++ b/src/os2Stubs.c @@ -34,6 +34,9 @@ * functions and the "optimized" select() for the clients */ #define I_NEED_OS2_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xpoll.h> #include <stdio.h> #include <sys/errno.h> diff --git a/src/udcInf.c b/src/udcInf.c index b2a01727..43b1cb02 100644 --- a/src/udcInf.c +++ b/src/udcInf.c @@ -35,6 +35,9 @@ from The Open Group. /* $XFree86: xc/lib/X11/udcInf.c,v 1.6 2001/01/17 19:41:57 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <locale.h> #include <Xlib.h> diff --git a/src/util/Makefile.am b/src/util/Makefile.am new file mode 100644 index 00000000..9c993b93 --- /dev/null +++ b/src/util/Makefile.am @@ -0,0 +1,6 @@ +noinst_PROGRAMS=makekeys + +makekeys_CFLAGS=$(X11_CFLAGS) $(BIGREQS_CFLAGS) + +override CC = gcc +LINK = gcc $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ diff --git a/src/x11_trans.c b/src/x11_trans.c new file mode 100644 index 00000000..d6bf5856 --- /dev/null +++ b/src/x11_trans.c @@ -0,0 +1,32 @@ +/* + * $Id: x11_trans.c,v 3.3 2003/11/01 00:33:15 anholt Exp $ + * + * Copyright © 2003 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE 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 + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#define X11_t +#define TRANS_CLIENT +#include <transport.c> + diff --git a/src/xcms/AddDIC.c b/src/xcms/AddDIC.c index 22364bec..d2638b1f 100644 --- a/src/xcms/AddDIC.c +++ b/src/xcms/AddDIC.c @@ -34,6 +34,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/AddSF.c b/src/xcms/AddSF.c index 39601c2b..3ab0514a 100644 --- a/src/xcms/AddSF.c +++ b/src/xcms/AddSF.c @@ -34,6 +34,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/CCC.c b/src/xcms/CCC.c index 20cd3840..7d4a9b1a 100644 --- a/src/xcms/CCC.c +++ b/src/xcms/CCC.c @@ -63,6 +63,9 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/CvColW.c b/src/xcms/CvColW.c index 336f606e..d57a7666 100644 --- a/src/xcms/CvColW.c +++ b/src/xcms/CvColW.c @@ -35,6 +35,9 @@ */ /* $XFree86: xc/lib/X11/CvColW.c,v 1.3 2001/01/17 19:41:34 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/CvCols.c b/src/xcms/CvCols.c index 6cd805b9..fc343cda 100644 --- a/src/xcms/CvCols.c +++ b/src/xcms/CvCols.c @@ -35,6 +35,9 @@ */ /* $XFree86: xc/lib/X11/CvCols.c,v 1.4 2003/04/13 19:22:15 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c index bc08867e..ed446bfd 100644 --- a/src/xcms/HVC.c +++ b/src/xcms/HVC.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.2 2004-04-23 18:43:24 eich Exp $ */ +/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.3 2005-05-13 22:53:43 sandmann Exp $ */ /* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ /* @@ -50,6 +50,9 @@ */ /* $XFree86: xc/lib/X11/HVC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <X11/Xos.h> diff --git a/src/xcms/HVCGcC.c b/src/xcms/HVCGcC.c index dc78bfec..10e0d487 100644 --- a/src/xcms/HVCGcC.c +++ b/src/xcms/HVCGcC.c @@ -45,6 +45,9 @@ */ /* $XFree86: xc/lib/X11/HVCGcC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/HVCGcV.c b/src/xcms/HVCGcV.c index 6b9f92b8..4e2c6368 100644 --- a/src/xcms/HVCGcV.c +++ b/src/xcms/HVCGcV.c @@ -45,6 +45,9 @@ */ /* $XFree86: xc/lib/X11/HVCGcV.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/HVCGcVC.c b/src/xcms/HVCGcVC.c index 1286a20e..eef20ae8 100644 --- a/src/xcms/HVCGcVC.c +++ b/src/xcms/HVCGcVC.c @@ -45,6 +45,9 @@ */ /* $XFree86: xc/lib/X11/HVCGcVC.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/HVCMnV.c b/src/xcms/HVCMnV.c index c730d088..63a51088 100644 --- a/src/xcms/HVCMnV.c +++ b/src/xcms/HVCMnV.c @@ -45,6 +45,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/HVCMxC.c b/src/xcms/HVCMxC.c index 636e6d39..64e7713e 100644 --- a/src/xcms/HVCMxC.c +++ b/src/xcms/HVCMxC.c @@ -46,6 +46,9 @@ */ /* $XFree86: xc/lib/X11/HVCMxC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/HVCMxV.c b/src/xcms/HVCMxV.c index 331651f1..34acdade 100644 --- a/src/xcms/HVCMxV.c +++ b/src/xcms/HVCMxV.c @@ -46,6 +46,9 @@ */ /* $XFree86: xc/lib/X11/HVCMxV.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/HVCMxVC.c b/src/xcms/HVCMxVC.c index 18060dba..74183fcf 100644 --- a/src/xcms/HVCMxVC.c +++ b/src/xcms/HVCMxVC.c @@ -46,6 +46,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/HVCMxVs.c b/src/xcms/HVCMxVs.c index cb843108..d90afa8b 100644 --- a/src/xcms/HVCMxVs.c +++ b/src/xcms/HVCMxVs.c @@ -45,6 +45,9 @@ */ /* $XFree86: xc/lib/X11/HVCMxVs.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/HVCWpAj.c b/src/xcms/HVCWpAj.c index c61ccbd8..558e90bc 100644 --- a/src/xcms/HVCWpAj.c +++ b/src/xcms/HVCWpAj.c @@ -46,6 +46,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/IdOfPr.c b/src/xcms/IdOfPr.c index 99173afa..a8eda895 100644 --- a/src/xcms/IdOfPr.c +++ b/src/xcms/IdOfPr.c @@ -34,6 +34,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/LRGB.c b/src/xcms/LRGB.c index 6f8c6fb7..e4bc0b50 100644 --- a/src/xcms/LRGB.c +++ b/src/xcms/LRGB.c @@ -37,6 +37,9 @@ */ /* $XFree86: xc/lib/X11/LRGB.c,v 3.6 2003/04/13 19:22:16 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xos.h> #include <X11/Xatom.h> diff --git a/src/xcms/Lab.c b/src/xcms/Lab.c index fed6115a..596c137f 100644 --- a/src/xcms/Lab.c +++ b/src/xcms/Lab.c @@ -39,6 +39,9 @@ /* $XFree86: xc/lib/X11/Lab.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xos.h> #include <stdio.h> /* sscanf */ #include "Xlibint.h" diff --git a/src/xcms/LabGcC.c b/src/xcms/LabGcC.c index 306b811a..e210cd23 100644 --- a/src/xcms/LabGcC.c +++ b/src/xcms/LabGcC.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/lib/X11/LabGcC.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/LabGcL.c b/src/xcms/LabGcL.c index 3311a978..445e4da5 100644 --- a/src/xcms/LabGcL.c +++ b/src/xcms/LabGcL.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/lib/X11/LabGcL.c,v 1.3 2001/01/17 19:41:38 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/LabGcLC.c b/src/xcms/LabGcLC.c index 85b1b001..f0726d93 100644 --- a/src/xcms/LabGcLC.c +++ b/src/xcms/LabGcLC.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/lib/X11/LabGcLC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/LabMnL.c b/src/xcms/LabMnL.c index dd5f5c1b..8016c4e6 100644 --- a/src/xcms/LabMnL.c +++ b/src/xcms/LabMnL.c @@ -33,6 +33,9 @@ */ /* $XFree86: xc/lib/X11/LabMnL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/LabMxC.c b/src/xcms/LabMxC.c index d03ed9d8..c57125b3 100644 --- a/src/xcms/LabMxC.c +++ b/src/xcms/LabMxC.c @@ -35,6 +35,9 @@ */ /* $XFree86: xc/lib/X11/LabMxC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/LabMxL.c b/src/xcms/LabMxL.c index 32f4bdbe..91b3f559 100644 --- a/src/xcms/LabMxL.c +++ b/src/xcms/LabMxL.c @@ -33,6 +33,9 @@ */ /* $XFree86: xc/lib/X11/LabMxL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/LabMxLC.c b/src/xcms/LabMxLC.c index e806bb19..d4efba34 100644 --- a/src/xcms/LabMxLC.c +++ b/src/xcms/LabMxLC.c @@ -40,6 +40,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/LabWpAj.c b/src/xcms/LabWpAj.c index ec2a68d2..38c57d26 100644 --- a/src/xcms/LabWpAj.c +++ b/src/xcms/LabWpAj.c @@ -34,6 +34,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/Luv.c b/src/xcms/Luv.c index 17fff09a..ec94c9e5 100644 --- a/src/xcms/Luv.c +++ b/src/xcms/Luv.c @@ -40,6 +40,9 @@ */ /* $XFree86: xc/lib/X11/Luv.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xos.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/LuvGcC.c b/src/xcms/LuvGcC.c index a945cc8a..ecae0fe6 100644 --- a/src/xcms/LuvGcC.c +++ b/src/xcms/LuvGcC.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/lib/X11/LuvGcC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/LuvGcL.c b/src/xcms/LuvGcL.c index e2a0aa13..81a553d3 100644 --- a/src/xcms/LuvGcL.c +++ b/src/xcms/LuvGcL.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/lib/X11/LuvGcL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/LuvGcLC.c b/src/xcms/LuvGcLC.c index c859e37b..a3cc0f68 100644 --- a/src/xcms/LuvGcLC.c +++ b/src/xcms/LuvGcLC.c @@ -32,6 +32,9 @@ */ /* $XFree86: xc/lib/X11/LuvGcLC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/LuvMnL.c b/src/xcms/LuvMnL.c index 668365db..9938ab49 100644 --- a/src/xcms/LuvMnL.c +++ b/src/xcms/LuvMnL.c @@ -33,6 +33,9 @@ */ /* $XFree86: xc/lib/X11/LuvMnL.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/LuvMxC.c b/src/xcms/LuvMxC.c index 2ff95afb..c77319d1 100644 --- a/src/xcms/LuvMxC.c +++ b/src/xcms/LuvMxC.c @@ -35,6 +35,9 @@ */ /* $XFree86: xc/lib/X11/LuvMxC.c,v 1.3 2001/01/17 19:41:39 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/LuvMxL.c b/src/xcms/LuvMxL.c index 08d01280..d364078a 100644 --- a/src/xcms/LuvMxL.c +++ b/src/xcms/LuvMxL.c @@ -33,6 +33,9 @@ */ /* $XFree86: xc/lib/X11/LuvMxL.c,v 1.3 2001/01/17 19:41:40 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <math.h> diff --git a/src/xcms/LuvMxLC.c b/src/xcms/LuvMxLC.c index bb00b713..3f4c2294 100644 --- a/src/xcms/LuvMxLC.c +++ b/src/xcms/LuvMxLC.c @@ -40,6 +40,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/LuvWpAj.c b/src/xcms/LuvWpAj.c index f19bfa5c..c48531a5 100644 --- a/src/xcms/LuvWpAj.c +++ b/src/xcms/LuvWpAj.c @@ -34,6 +34,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/OfCCC.c b/src/xcms/OfCCC.c index 20d3a9be..1f963168 100644 --- a/src/xcms/OfCCC.c +++ b/src/xcms/OfCCC.c @@ -34,6 +34,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlib.h" #include "Xcms.h" diff --git a/src/xcms/PrOfId.c b/src/xcms/PrOfId.c index 84c6166a..d8fe6e9f 100644 --- a/src/xcms/PrOfId.c +++ b/src/xcms/PrOfId.c @@ -34,6 +34,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/QBlack.c b/src/xcms/QBlack.c index c54dccb4..ec044940 100644 --- a/src/xcms/QBlack.c +++ b/src/xcms/QBlack.c @@ -34,6 +34,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcms.h" diff --git a/src/xcms/QBlue.c b/src/xcms/QBlue.c index 2bca3877..60268519 100644 --- a/src/xcms/QBlue.c +++ b/src/xcms/QBlue.c @@ -34,6 +34,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcms.h" diff --git a/src/xcms/QGreen.c b/src/xcms/QGreen.c index f7858c32..59bbbd5f 100644 --- a/src/xcms/QGreen.c +++ b/src/xcms/QGreen.c @@ -34,6 +34,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcms.h" diff --git a/src/xcms/QRed.c b/src/xcms/QRed.c index 136ebc2e..bcd276c2 100644 --- a/src/xcms/QRed.c +++ b/src/xcms/QRed.c @@ -34,6 +34,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcms.h" diff --git a/src/xcms/QWhite.c b/src/xcms/QWhite.c index 93d37d38..7e58db65 100644 --- a/src/xcms/QWhite.c +++ b/src/xcms/QWhite.c @@ -34,6 +34,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcms.h" diff --git a/src/xcms/QuCol.c b/src/xcms/QuCol.c index 3c48467b..0864bc8a 100644 --- a/src/xcms/QuCol.c +++ b/src/xcms/QuCol.c @@ -34,6 +34,9 @@ */ /* $XFree86: xc/lib/X11/QuCol.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/QuCols.c b/src/xcms/QuCols.c index 3f4350b1..d6c4890e 100644 --- a/src/xcms/QuCols.c +++ b/src/xcms/QuCols.c @@ -34,6 +34,9 @@ */ /* $XFree86: xc/lib/X11/QuCols.c,v 1.3 2001/01/17 19:41:42 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/SetCCC.c b/src/xcms/SetCCC.c index e8d3a779..8ab0464d 100644 --- a/src/xcms/SetCCC.c +++ b/src/xcms/SetCCC.c @@ -35,6 +35,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcms.h" diff --git a/src/xcms/SetGetCols.c b/src/xcms/SetGetCols.c index 66477652..03f7a2f7 100644 --- a/src/xcms/SetGetCols.c +++ b/src/xcms/SetGetCols.c @@ -39,6 +39,9 @@ * Include files that must be exported to any package or * program using this package. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/StCol.c b/src/xcms/StCol.c index 5893d65b..80c3f7d9 100644 --- a/src/xcms/StCol.c +++ b/src/xcms/StCol.c @@ -34,6 +34,9 @@ */ /* $XFree86: xc/lib/X11/StCol.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/StCols.c b/src/xcms/StCols.c index 8219a7f1..cff6cc34 100644 --- a/src/xcms/StCols.c +++ b/src/xcms/StCols.c @@ -34,6 +34,9 @@ */ /* $XFree86: xc/lib/X11/StCols.c,v 1.3 2001/01/17 19:41:44 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/UNDEFINED.c b/src/xcms/UNDEFINED.c index 520d97a1..2c056307 100644 --- a/src/xcms/UNDEFINED.c +++ b/src/xcms/UNDEFINED.c @@ -35,6 +35,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/XRGB.c b/src/xcms/XRGB.c index f868afcc..0d7e24c7 100644 --- a/src/xcms/XRGB.c +++ b/src/xcms/XRGB.c @@ -35,6 +35,9 @@ */ /* $XFree86: xc/lib/X11/XRGB.c,v 3.3 2001/07/29 05:01:11 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/XYZ.c b/src/xcms/XYZ.c index 86b18e10..f5f17f35 100644 --- a/src/xcms/XYZ.c +++ b/src/xcms/XYZ.c @@ -35,6 +35,9 @@ */ /* $XFree86: xc/lib/X11/XYZ.c,v 1.3 2001/01/17 19:41:49 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xos.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/cmsAllCol.c b/src/xcms/cmsAllCol.c index 4d301485..3aca5736 100644 --- a/src/xcms/cmsAllCol.c +++ b/src/xcms/cmsAllCol.c @@ -34,6 +34,9 @@ */ /* $XFree86: xc/lib/X11/cmsAllCol.c,v 1.3 2001/01/17 19:41:50 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/cmsAllNCol.c b/src/xcms/cmsAllNCol.c index efbb1e83..efee0f6b 100644 --- a/src/xcms/cmsAllNCol.c +++ b/src/xcms/cmsAllNCol.c @@ -35,6 +35,9 @@ /* $XFree86: xc/lib/X11/cmsAllNCol.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/cmsCmap.c b/src/xcms/cmsCmap.c index acdbb9d7..bc26638c 100644 --- a/src/xcms/cmsCmap.c +++ b/src/xcms/cmsCmap.c @@ -37,6 +37,9 @@ #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Xutil.h" diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c index f7dd472f..cf1286d7 100644 --- a/src/xcms/cmsColNm.c +++ b/src/xcms/cmsColNm.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.2 2004-04-23 18:43:24 eich Exp $ */ +/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.3 2005-05-13 22:53:44 sandmann Exp $ */ /* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ /* @@ -34,6 +34,9 @@ */ /* $XFree86: xc/lib/X11/cmsColNm.c,v 3.11 2003/04/13 19:22:20 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include <X11/Xos.h> diff --git a/src/xcms/cmsGlobls.c b/src/xcms/cmsGlobls.c index 2a92a229..abe711c6 100644 --- a/src/xcms/cmsGlobls.c +++ b/src/xcms/cmsGlobls.c @@ -34,6 +34,9 @@ */ /* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.4 2001/01/17 19:41:51 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" #include "Cv.h" diff --git a/src/xcms/cmsInt.c b/src/xcms/cmsInt.c index ea75c503..68cfebd7 100644 --- a/src/xcms/cmsInt.c +++ b/src/xcms/cmsInt.c @@ -37,6 +37,9 @@ /* $XFree86: xc/lib/X11/cmsInt.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */ /* #define NEED_EVENTS */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/cmsLkCol.c b/src/xcms/cmsLkCol.c index 8b3f5346..f19f21d0 100644 --- a/src/xcms/cmsLkCol.c +++ b/src/xcms/cmsLkCol.c @@ -35,6 +35,9 @@ /* $XFree86: xc/lib/X11/cmsLkCol.c,v 1.5 2003/04/13 19:22:20 dawes Exp $ */ #define NEED_REPLIES +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/cmsMath.c b/src/xcms/cmsMath.c index 04c0aea7..c97c7a90 100644 --- a/src/xcms/cmsMath.c +++ b/src/xcms/cmsMath.c @@ -31,6 +31,9 @@ in this Software without prior written authorization from The Open Group. * Stephen Gildea, MIT X Consortium, January 1991 */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/cmsProp.c b/src/xcms/cmsProp.c index 7af729a7..4040a05c 100644 --- a/src/xcms/cmsProp.c +++ b/src/xcms/cmsProp.c @@ -33,6 +33,9 @@ */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xatom.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/cmsTrig.c b/src/xcms/cmsTrig.c index 6ff60e9e..1859fa93 100644 --- a/src/xcms/cmsTrig.c +++ b/src/xcms/cmsTrig.c @@ -45,6 +45,9 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xcmsint.h" /* forward/static */ diff --git a/src/xcms/uvY.c b/src/xcms/uvY.c index d589b407..d7c3e6ab 100644 --- a/src/xcms/uvY.c +++ b/src/xcms/uvY.c @@ -37,6 +37,9 @@ */ /* $XFree86: xc/lib/X11/uvY.c,v 1.3 2001/01/17 19:41:57 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xos.h> #include "Xlibint.h" #include "Xcmsint.h" diff --git a/src/xcms/xyY.c b/src/xcms/xyY.c index 749a05bb..63e80bc5 100644 --- a/src/xcms/xyY.c +++ b/src/xcms/xyY.c @@ -36,6 +36,9 @@ */ /* $XFree86: xc/lib/X11/xyY.c,v 1.3 2001/01/17 19:41:57 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <X11/Xos.h> #include "Xlibint.h" diff --git a/src/xim_trans.c b/src/xim_trans.c new file mode 100644 index 00000000..8a9030fe --- /dev/null +++ b/src/xim_trans.c @@ -0,0 +1,28 @@ +/* + * $Id: xim_trans.c,v 3.2 2003/09/26 21:07:29 keithp Exp $ + * + * Copyright © 2003 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE 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 + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#define XIM_t +#define TRANS_CLIENT + +#include <transport.c> diff --git a/src/xkb/XKB.c b/src/xkb/XKB.c index 20936198..ecc5ddf0 100644 --- a/src/xkb/XKB.c +++ b/src/xkb/XKB.c @@ -26,6 +26,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKB.c,v 1.9 2003/04/17 02:06:31 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c index a6fec50f..cc85b8f9 100644 --- a/src/xkb/XKBAlloc.c +++ b/src/xkb/XKBAlloc.c @@ -28,6 +28,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef XKB_IN_SERVER +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBBell.c b/src/xkb/XKBBell.c index 4c33b8e2..6ea30855 100644 --- a/src/xkb/XKBBell.c +++ b/src/xkb/XKBBell.c @@ -26,6 +26,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c index 5b4ae09d..e190d005 100644 --- a/src/xkb/XKBBind.c +++ b/src/xkb/XKBBind.c @@ -31,6 +31,9 @@ from The Open Group. /* the new monsters ate the old ones */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "XKBlib.h" #include <X11/Xlibint.h> #include <X11/Xutil.h> diff --git a/src/xkb/XKBCompat.c b/src/xkb/XKBCompat.c index 859e0a0c..5886e4d2 100644 --- a/src/xkb/XKBCompat.c +++ b/src/xkb/XKBCompat.c @@ -26,6 +26,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBCtrls.c b/src/xkb/XKBCtrls.c index bc58316b..0ea131aa 100644 --- a/src/xkb/XKBCtrls.c +++ b/src/xkb/XKBCtrls.c @@ -26,6 +26,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBCtrls.c,v 1.4 2002/12/10 04:33:48 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBCvt.c b/src/xkb/XKBCvt.c index f2347fa8..13697276 100644 --- a/src/xkb/XKBCvt.c +++ b/src/xkb/XKBCvt.c @@ -28,6 +28,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/XKBCvt.c,v 3.34 2002/10/08 23:31:35 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/src/xkb/XKBExtDev.c b/src/xkb/XKBExtDev.c index 1bc9a064..34558e47 100644 --- a/src/xkb/XKBExtDev.c +++ b/src/xkb/XKBExtDev.c @@ -26,6 +26,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.4 2001/10/28 03:32:33 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c index 6aa41d06..a1c0d1be 100644 --- a/src/xkb/XKBGAlloc.c +++ b/src/xkb/XKBGAlloc.c @@ -31,6 +31,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef XKB_IN_SERVER +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "XKBlibint.h" diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c index f41823f5..06117548 100644 --- a/src/xkb/XKBGeom.c +++ b/src/xkb/XKBGeom.c @@ -27,6 +27,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/lib/X11/XKBGeom.c,v 1.5 2003/04/13 19:22:18 dawes Exp $ */ #ifdef DEBUG +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #endif diff --git a/src/xkb/XKBGetByName.c b/src/xkb/XKBGetByName.c index 70258ce0..2c6ff084 100644 --- a/src/xkb/XKBGetByName.c +++ b/src/xkb/XKBGetByName.c @@ -29,6 +29,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #define NEED_MAP_READERS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/extensions/XKBproto.h> #include "XKBlibint.h" diff --git a/src/xkb/XKBGetMap.c b/src/xkb/XKBGetMap.c index 71fc7f48..2b9fb97f 100644 --- a/src/xkb/XKBGetMap.c +++ b/src/xkb/XKBGetMap.c @@ -30,6 +30,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #define NEED_MAP_READERS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/extensions/XKBproto.h> #include "XKBlibint.h" diff --git a/src/xkb/XKBList.c b/src/xkb/XKBList.c index e72ced96..2f4a5349 100644 --- a/src/xkb/XKBList.c +++ b/src/xkb/XKBList.c @@ -29,6 +29,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #define NEED_MAP_READERS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/extensions/XKBproto.h> #include "XKBlibint.h" diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c index d1fd14f2..9fe33e7d 100644 --- a/src/xkb/XKBMAlloc.c +++ b/src/xkb/XKBMAlloc.c @@ -28,6 +28,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef XKB_IN_SERVER +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c index afc0dbeb..987c6e33 100644 --- a/src/xkb/XKBMisc.c +++ b/src/xkb/XKBMisc.c @@ -28,6 +28,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifndef XKB_IN_SERVER +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBNames.c b/src/xkb/XKBNames.c index 490deff2..a8eeb2ad 100644 --- a/src/xkb/XKBNames.c +++ b/src/xkb/XKBNames.c @@ -29,6 +29,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #define NEED_MAP_READERS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/extensions/XKBproto.h> #include "XKBlibint.h" diff --git a/src/xkb/XKBRdBuf.c b/src/xkb/XKBRdBuf.c index 9b84424a..a68a80a3 100644 --- a/src/xkb/XKBRdBuf.c +++ b/src/xkb/XKBRdBuf.c @@ -26,6 +26,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBRdBuf.c,v 1.2 2001/10/28 03:32:33 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBSetGeom.c b/src/xkb/XKBSetGeom.c index 148e5e54..912f7ebd 100644 --- a/src/xkb/XKBSetGeom.c +++ b/src/xkb/XKBSetGeom.c @@ -1,5 +1,5 @@ /* $Xorg: XKBSetGeom.c,v 1.3 2000/08/17 19:45:03 cpqbld Exp $ */ -/* $XdotOrg: lib/X11/src/xkb/XKBSetGeom.c,v 1.3 2005-03-21 04:58:21 alanc Exp $ */ +/* $XdotOrg: lib/X11/src/xkb/XKBSetGeom.c,v 1.4 2005-05-13 22:53:44 sandmann Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -28,6 +28,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/lib/X11/XKBSetGeom.c,v 3.5 2003/05/27 22:26:25 tsi Exp $ */ #ifdef DEBUG +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #endif diff --git a/src/xkb/XKBSetMap.c b/src/xkb/XKBSetMap.c index 3e56e98a..4a3b15c7 100644 --- a/src/xkb/XKBSetMap.c +++ b/src/xkb/XKBSetMap.c @@ -26,6 +26,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBSetMap.c,v 3.2 2001/01/17 19:41:49 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/src/xkb/XKBUse.c b/src/xkb/XKBUse.c index aea49cb6..ad18bb6f 100644 --- a/src/xkb/XKBUse.c +++ b/src/xkb/XKBUse.c @@ -26,6 +26,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBUse.c,v 3.7 2003/07/07 15:34:21 eich Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <ctype.h> #define NEED_REPLIES diff --git a/src/xkb/XKBleds.c b/src/xkb/XKBleds.c index be6e6a1a..89ab2e9e 100644 --- a/src/xkb/XKBleds.c +++ b/src/xkb/XKBleds.c @@ -29,6 +29,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS #define NEED_MAP_READERS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include <X11/extensions/XKBproto.h> #include "XKBlibint.h" diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c index 73b16031..b51da6f4 100644 --- a/src/xlibi18n/ICWrap.c +++ b/src/xlibi18n/ICWrap.c @@ -67,6 +67,9 @@ from The Open Group. /* $XFree86: xc/lib/X11/ICWrap.c,v 1.10 2003/04/25 14:12:38 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/xlibi18n/IMWrap.c b/src/xlibi18n/IMWrap.c index 8cfef782..a90b4067 100644 --- a/src/xlibi18n/IMWrap.c +++ b/src/xlibi18n/IMWrap.c @@ -59,6 +59,9 @@ from The Open Group. /* $XFree86: xc/lib/X11/IMWrap.c,v 3.8 2001/12/14 19:54:01 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/xlibi18n/XDefaultIMIF.c b/src/xlibi18n/XDefaultIMIF.c index 6ab3ac6b..41bd43c1 100644 --- a/src/xlibi18n/XDefaultIMIF.c +++ b/src/xlibi18n/XDefaultIMIF.c @@ -43,6 +43,9 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* $XFree86: xc/lib/X11/XDefaultIMIF.c,v 1.3 2003/04/13 19:22:18 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #define NEED_EVENTS #include "Xlibint.h" diff --git a/src/xlibi18n/XDefaultOMIF.c b/src/xlibi18n/XDefaultOMIF.c index 9182d6de..13f0d9cf 100644 --- a/src/xlibi18n/XDefaultOMIF.c +++ b/src/xlibi18n/XDefaultOMIF.c @@ -43,6 +43,9 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* $XFree86: xc/lib/X11/XDefaultOMIF.c,v 1.5 2003/04/17 02:39:56 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" #include "XlcPublic.h" diff --git a/src/xlibi18n/XlcDL.c b/src/xlibi18n/XlcDL.c index 2c7529f8..6bdd4818 100644 --- a/src/xlibi18n/XlcDL.c +++ b/src/xlibi18n/XlcDL.c @@ -42,8 +42,11 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* $XFree86: xc/lib/X11/XlcDL.c,v 1.12 2003/04/13 19:22:19 dawes Exp $ */ -/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.2 2004-04-23 18:43:24 eich Exp $ */ +/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.3 2005-05-13 22:53:44 sandmann Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #if defined(hpux) #include <dl.h> diff --git a/src/xlibi18n/XlcSL.c b/src/xlibi18n/XlcSL.c index bcf0a001..9e6b67f3 100644 --- a/src/xlibi18n/XlcSL.c +++ b/src/xlibi18n/XlcSL.c @@ -43,6 +43,9 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* $XFree86$ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/xlibi18n/imKStoUCS.c b/src/xlibi18n/imKStoUCS.c index 3504a74e..7d8d5b92 100644 --- a/src/xlibi18n/imKStoUCS.c +++ b/src/xlibi18n/imKStoUCS.c @@ -1,5 +1,8 @@ /* $XFree86: xc/lib/X11/imKStoUCS.c,v 1.4 2003/04/29 11:29:18 pascal Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Ximint.h" diff --git a/src/xlibi18n/lcCT.c b/src/xlibi18n/lcCT.c index 2afca02a..63608a3c 100644 --- a/src/xlibi18n/lcCT.c +++ b/src/xlibi18n/lcCT.c @@ -38,6 +38,9 @@ */ /* $XFree86: xc/lib/X11/lcCT.c,v 3.26 2001/10/28 03:32:34 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcPubI.h" #include <X11/Xos.h> diff --git a/src/xlibi18n/lcCharSet.c b/src/xlibi18n/lcCharSet.c index 3877495e..006a0be2 100644 --- a/src/xlibi18n/lcCharSet.c +++ b/src/xlibi18n/lcCharSet.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/lcCharSet.c,v 3.8 2001/01/17 19:41:53 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "XlcPublic.h" diff --git a/src/xlibi18n/lcConv.c b/src/xlibi18n/lcConv.c index 88ae52f4..2f65ac7b 100644 --- a/src/xlibi18n/lcConv.c +++ b/src/xlibi18n/lcConv.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/lcConv.c,v 1.5 2000/12/04 18:49:26 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcPubI.h" #include <stdio.h> diff --git a/src/xlibi18n/lcDB.c b/src/xlibi18n/lcDB.c index 2ed5f13a..ffa8f49a 100644 --- a/src/xlibi18n/lcDB.c +++ b/src/xlibi18n/lcDB.c @@ -34,6 +34,9 @@ #ifndef NOT_X_ENV +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlib.h> #include <X11/Xresource.h> #include "Xlibint.h" diff --git a/src/xlibi18n/lcDynamic.c b/src/xlibi18n/lcDynamic.c index e443a056..5d359ed7 100644 --- a/src/xlibi18n/lcDynamic.c +++ b/src/xlibi18n/lcDynamic.c @@ -42,6 +42,9 @@ from The Open Group. */ #ifdef USE_DYNAMIC_LOADER +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include <string.h> #include <dlfcn.h> diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c index 39e59345..4c4956f0 100644 --- a/src/xlibi18n/lcFile.c +++ b/src/xlibi18n/lcFile.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/lcFile.c,v 3.32 2003/03/25 04:18:09 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdlib.h> #include <stdio.h> #include <ctype.h> diff --git a/src/xlibi18n/lcGeneric.c b/src/xlibi18n/lcGeneric.c index 7922928e..dead3056 100644 --- a/src/xlibi18n/lcGeneric.c +++ b/src/xlibi18n/lcGeneric.c @@ -30,6 +30,9 @@ */ /* $XFree86: xc/lib/X11/lcGeneric.c,v 3.19 2003/05/27 16:55:27 tsi Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "XlcGeneric.h" diff --git a/src/xlibi18n/lcInit.c b/src/xlibi18n/lcInit.c index d034f4e0..6375de80 100644 --- a/src/xlibi18n/lcInit.c +++ b/src/xlibi18n/lcInit.c @@ -76,6 +76,9 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* $XFree86: xc/lib/X11/lcInit.c,v 3.9 2001/11/16 00:52:27 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/xlibi18n/lcPrTxt.c b/src/xlibi18n/lcPrTxt.c index 3670340c..5a781280 100644 --- a/src/xlibi18n/lcPrTxt.c +++ b/src/xlibi18n/lcPrTxt.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.9 2003/04/03 22:34:02 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcPubI.h" #include <X11/Xutil.h> diff --git a/src/xlibi18n/lcPubWrap.c b/src/xlibi18n/lcPubWrap.c index cbbb65c2..e30a55c0 100644 --- a/src/xlibi18n/lcPubWrap.c +++ b/src/xlibi18n/lcPubWrap.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/lcPubWrap.c,v 1.4 2001/01/17 19:41:55 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcPubI.h" diff --git a/src/xlibi18n/lcPublic.c b/src/xlibi18n/lcPublic.c index 7b5e4230..d8045161 100644 --- a/src/xlibi18n/lcPublic.c +++ b/src/xlibi18n/lcPublic.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/lcPublic.c,v 1.11 2001/11/16 00:52:28 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "XlcPubI.h" diff --git a/src/xlibi18n/lcRM.c b/src/xlibi18n/lcRM.c index 23ce80d3..1ffa4ef7 100644 --- a/src/xlibi18n/lcRM.c +++ b/src/xlibi18n/lcRM.c @@ -26,6 +26,9 @@ */ /* $XFree86: xc/lib/X11/lcRM.c,v 1.4 2000/11/28 18:49:48 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcPubI.h" #include <stdio.h> diff --git a/src/xlibi18n/lcStd.c b/src/xlibi18n/lcStd.c index 81216aaa..e112dcea 100644 --- a/src/xlibi18n/lcStd.c +++ b/src/xlibi18n/lcStd.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/lcStd.c,v 1.6 2003/04/13 19:22:21 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcPubI.h" diff --git a/src/xlibi18n/lcTxtPr.c b/src/xlibi18n/lcTxtPr.c index a58ef48b..1f9765f6 100644 --- a/src/xlibi18n/lcTxtPr.c +++ b/src/xlibi18n/lcTxtPr.c @@ -25,6 +25,9 @@ */ /* $XFree86: xc/lib/X11/lcTxtPr.c,v 3.3 2001/01/17 19:41:55 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "XlcPubI.h" #include <X11/Xutil.h> diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c index 9caaf2eb..40525003 100644 --- a/src/xlibi18n/lcUTF8.c +++ b/src/xlibi18n/lcUTF8.c @@ -73,6 +73,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * without first going through the list of predefined character sets. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdio.h> #include "Xlibint.h" #include "XlcPubI.h" diff --git a/src/xlibi18n/lcUtil.c b/src/xlibi18n/lcUtil.c index fb159098..ab1db008 100644 --- a/src/xlibi18n/lcUtil.c +++ b/src/xlibi18n/lcUtil.c @@ -26,6 +26,9 @@ */ /* $XFree86: xc/lib/X11/lcUtil.c,v 1.3 2000/11/29 17:40:24 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlib.h> #include "XlcPublic.h" diff --git a/src/xlibi18n/lcWrap.c b/src/xlibi18n/lcWrap.c index e489d6a4..ea262319 100644 --- a/src/xlibi18n/lcWrap.c +++ b/src/xlibi18n/lcWrap.c @@ -55,6 +55,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/lcWrap.c,v 3.15 2003/04/13 19:22:22 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <stdlib.h> #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/xlibi18n/mbWMProps.c b/src/xlibi18n/mbWMProps.c index 44f38139..a5f7732e 100644 --- a/src/xlibi18n/mbWMProps.c +++ b/src/xlibi18n/mbWMProps.c @@ -28,6 +28,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/mbWMProps.c,v 1.5 2001/12/14 19:54:10 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include <X11/Xatom.h> diff --git a/src/xlibi18n/mbWrap.c b/src/xlibi18n/mbWrap.c index 6eca32fc..827c10b1 100644 --- a/src/xlibi18n/mbWrap.c +++ b/src/xlibi18n/mbWrap.c @@ -52,6 +52,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/mbWrap.c,v 1.6 2001/12/14 19:54:10 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/xlibi18n/utf8WMProps.c b/src/xlibi18n/utf8WMProps.c index 084e3d33..e3a329ac 100644 --- a/src/xlibi18n/utf8WMProps.c +++ b/src/xlibi18n/utf8WMProps.c @@ -50,6 +50,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/utf8WMProps.c,v 1.2 2001/12/14 19:54:11 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include <X11/Xatom.h> diff --git a/src/xlibi18n/utf8Wrap.c b/src/xlibi18n/utf8Wrap.c index 1a36463d..bde3f041 100644 --- a/src/xlibi18n/utf8Wrap.c +++ b/src/xlibi18n/utf8Wrap.c @@ -74,6 +74,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/utf8Wrap.c,v 1.3 2001/12/14 19:54:11 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/src/xlibi18n/wcWrap.c b/src/xlibi18n/wcWrap.c index d28f9d09..a0314da7 100644 --- a/src/xlibi18n/wcWrap.c +++ b/src/xlibi18n/wcWrap.c @@ -53,6 +53,9 @@ from The Open Group. */ /* $XFree86: xc/lib/X11/wcWrap.c,v 1.6 2001/12/14 19:54:11 dawes Exp $ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include "Xlibint.h" #include "Xlcint.h" diff --git a/x11.pc.in b/x11.pc.in new file mode 100644 index 00000000..40f581df --- /dev/null +++ b/x11.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: X11 +Description: X Library +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lX11 @XPROTO_LIBS@ @LIBS@ +Cflags: -I${includedir} @XPROTO_CFLAGS@ |