From d34fc70fab4607f70184206a592397c97c3e478e Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 17 Dec 2009 14:31:58 +0000 Subject: Git update 17/12/2009 --- .../hw/xfree86/os-support/solaris/solaris-amd64.S | 40 +++++++++------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S') diff --git a/xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S b/xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S index 4a0e0f48a..94ffa40e7 100644 --- a/xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S +++ b/xorg-server/hw/xfree86/os-support/solaris/solaris-amd64.S @@ -1,29 +1,23 @@ / Copyright 2005 Sun Microsystems, Inc. All rights reserved. / / Permission is hereby granted, free of charge, to any person obtaining a -/ copy of this software and associated documentation files (the -/ "Software"), to deal in the Software without restriction, including -/ without limitation the rights to use, copy, modify, merge, publish, -/ distribute, and/or sell copies of the Software, and to permit persons -/ to whom the Software is furnished to do so, provided that the above -/ copyright notice(s) and this permission notice appear in all copies of -/ the Software and that both the above copyright notice(s) and this -/ permission notice appear in supporting documentation. -/ -/ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -/ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -/ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -/ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -/ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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. -/ -/ Except as contained in this notice, the name of a copyright holder -/ shall not be used in advertising or otherwise to promote the sale, use -/ or other dealings in this Software without prior written authorization -/ of the copyright holder. +/ copy of this software and associated documentation files (the "Software"), +/ to deal in the Software without restriction, including without limitation +/ the rights to use, copy, modify, merge, publish, distribute, sublicense, +/ and/or sell copies of the Software, and to permit persons to whom the +/ Software is furnished to do so, subject to the following conditions: +/ +/ The above copyright notice and this permission notice (including the next +/ paragraph) shall be included in all copies or substantial portions of the +/ Software. +/ +/ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +/ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +/ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +/ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +/ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +/ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +/ DEALINGS IN THE SOFTWARE. #ifdef INLINE_ASM #define FUNCTION_START(f,n) .inline f,n -- cgit v1.2.3