diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2010-04-16 22:24:38 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2010-04-19 11:51:11 -0400 |
| commit | bdb5416371fd16ee698f744c33a18ef1a0f83d73 (patch) | |
| tree | c2f59718554d59b5ac0a83d564e5be4f8d8ac89a /recipes/xorg-lib/xorg-headers-native/X11/Xresource.h | |
| parent | c1993858d847ac17f4bd00655adf5655fd9d2c6c (diff) | |
xorg-headers-native: haven't been updated since 2006, do so now
Update the combined headers from the following packages:
* xproto-7.0.16
* libx11-1.3.3
* libxau-1.0.5
* libxdmcp-1.0.3
* libxt-1.0.8
For example, GenericEvent is new since xproto-7.0.13 and prevents
libx11-native from building on an X-less host.
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Diffstat (limited to 'recipes/xorg-lib/xorg-headers-native/X11/Xresource.h')
| -rw-r--r-- | recipes/xorg-lib/xorg-headers-native/X11/Xresource.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Xresource.h b/recipes/xorg-lib/xorg-headers-native/X11/Xresource.h index ce1213748c..dbb144c273 100644 --- a/recipes/xorg-lib/xorg-headers-native/X11/Xresource.h +++ b/recipes/xorg-lib/xorg-headers-native/X11/Xresource.h @@ -1,4 +1,3 @@ -/* $Xorg: Xresource.h,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */ /*********************************************************** @@ -29,13 +28,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/Xresource.h,v 3.8 2001/12/14 19:54:10 dawes Exp $ */ #ifndef _XRESOURCE_H_ #define _XRESOURCE_H_ @@ -178,7 +176,7 @@ typedef struct _XrmHashBucketRec *XrmDatabase; extern void XrmDestroyDatabase( - XrmDatabase /* database */ + XrmDatabase /* database */ ); extern void XrmQPutResource( @@ -333,7 +331,7 @@ typedef enum { XrmoptionResArg, /* Resource and value in next argument in argv */ XrmoptionSkipArg, /* Ignore this option and the next argument in argv */ XrmoptionSkipLine, /* Ignore this option and the rest of argv */ - XrmoptionSkipNArgs /* Ignore this option and the next + XrmoptionSkipNArgs /* Ignore this option and the next OptionDescRes.value arguments in argv */ } XrmOptionKind; @@ -351,7 +349,7 @@ extern void XrmParseCommand( int /* table_count */, _Xconst char* /* name */, int* /* argc_in_out */, - char** /* argv_in_out */ + char** /* argv_in_out */ ); _XFUNCPROTOEND |