diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-04-19 22:28:57 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-04-19 22:28:57 +0200 |
| commit | 89fd09bf9e240e8d2e9307777d56ae56799789b2 (patch) | |
| tree | 2d0e9c0dbaee3e01b3acf990311193ff2efddb26 /recipes/xorg-lib/xorg-headers-native/X11/Xcms.h | |
| parent | b82f2e190517a02d7c1f7003e667dcf42f168834 (diff) | |
| parent | 8104d8054ea49891b4a92f22ee3b13a70557ceb2 (diff) | |
| download | openembedded-89fd09bf9e240e8d2e9307777d56ae56799789b2.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/unstable
Diffstat (limited to 'recipes/xorg-lib/xorg-headers-native/X11/Xcms.h')
| -rw-r--r-- | recipes/xorg-lib/xorg-headers-native/X11/Xcms.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xcms.h b/recipes/xorg-lib/xorg-headers-native/X11/Xcms.h index 779bc52ffd..cea11ab488 100644 --- a/recipes/xorg-lib/xorg-headers-native/X11/Xcms.h +++ b/recipes/xorg-lib/xorg-headers-native/X11/Xcms.h @@ -1,9 +1,8 @@ -/* $Xorg: Xcms.h,v 1.6 2000/08/17 19:45:04 cpqbld Exp $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved - * + * * This file is a component of an X Window System-specific implementation * of Xcms based on the TekColor Color Management System. Permission is * hereby granted to use, copy, modify, sell, and otherwise distribute this @@ -11,10 +10,10 @@ * that this copyright, permission, and disclaimer notice is reproduced in * all copies of this software and in supporting documentation. TekColor * is a trademark of Tektronix, Inc. - * + * * Tektronix makes no representation about the suitability of this software * for any purpose. It is provided "as is" and with all faults. - * + * * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE, * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY @@ -27,7 +26,6 @@ * DESCRIPTION * Public include file for X Color Management System */ -/* $XFree86: xc/lib/X11/Xcms.h,v 1.7 2003/11/03 03:46:26 dawes Exp $ */ #ifndef _XCMS_H_ #define _XCMS_H_ @@ -252,7 +250,7 @@ typedef void (*XcmsScreenFreeProc)( * XXX: The use of the XcmsConversionProc type is broken. The * device-independent colour conversion code uses it as: -typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *, +typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *, unsigned int); * while the device-dependent code uses it as: |