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>

63 files changed, 1267 insertions, 1401 deletions

diff --git a/recipes/xorg-lib/xorg-headers-native.bb b/recipes/xorg-lib/xorg-headers-native.bb
index 555a737f0a..ccc36432b5 100644
--- a/recipes/xorg-lib/xorg-headers-native.bb
+++ b/recipes/xorg-lib/xorg-headers-native.bb
@@ -1,6 +1,6 @@
 inherit native
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "file://X11"
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/CallbackI.h b/recipes/xorg-lib/xorg-headers-native/X11/CallbackI.h
index 4ae08ab019..64e8152566 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/CallbackI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/CallbackI.h
@@ -58,6 +58,8 @@ typedef XrmResource **CallbackTable;
 #define _XtCBCalling 1
 #define _XtCBFreeAfterCalling 2
 
+_XFUNCPROTOBEGIN
+
 typedef struct internalCallbackRec {
     unsigned short count;
     char	   is_padded;	/* contains NULL padding for external form */
@@ -115,3 +117,5 @@ extern void _XtCallConditionalCallbackList(
     XtPointer			/* call_data */,
     _XtConditionProc		/* cond_proc */
 );
+
+_XFUNCPROTOEND
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Composite.h b/recipes/xorg-lib/xorg-headers-native/X11/Composite.h
index 0a58332be5..c3c982868b 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Composite.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Composite.h
@@ -97,7 +97,7 @@ extern void XtChangeManagedSet(
 
 _XFUNCPROTOEND
 
-#ifndef XT_COMPOSITE
+#ifndef VMS
 externalref WidgetClass compositeWidgetClass;
 #endif
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/CompositeP.h b/recipes/xorg-lib/xorg-headers-native/X11/CompositeP.h
index ed055b21fa..e93275ace2 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/CompositeP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/CompositeP.h
@@ -52,6 +52,8 @@ SOFTWARE.
 
 #include <X11/Composite.h>
 
+_XFUNCPROTOBEGIN
+
 /************************************************************************
  *
  * Additional instance fields for widgets of (sub)class 'Composite' 
@@ -101,6 +103,8 @@ typedef struct _CompositeClassRec {
 
 externalref CompositeClassRec compositeClassRec;
 
+_XFUNCPROTOEND
+
 #define XtCompositeExtensionVersion 2L
 #define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
 #define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ConstrainP.h b/recipes/xorg-lib/xorg-headers-native/X11/ConstrainP.h
index a90d19ac6c..7030a3411a 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ConstrainP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ConstrainP.h
@@ -52,6 +52,8 @@ SOFTWARE.
 
 #include <X11/Constraint.h>
 
+_XFUNCPROTOBEGIN
+
 typedef struct _ConstraintPart {
     XtPointer   mumble;		/* No new fields, keep C compiler happy */
 } ConstraintPart;
@@ -88,6 +90,8 @@ typedef struct _ConstraintClassRec {
 
 externalref ConstraintClassRec constraintClassRec;
 
+_XFUNCPROTOEND
+
 #define XtConstraintExtensionVersion 1L
 
 #endif /* _XtConstraintP_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Constraint.h b/recipes/xorg-lib/xorg-headers-native/X11/Constraint.h
index 9bb962e0d2..977e7eeac2 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Constraint.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Constraint.h
@@ -50,11 +50,15 @@ SOFTWARE.
 #ifndef _XtConstraint_h
 #define _XtConstraint_h
 
+_XFUNCPROTOBEGIN
+
 typedef struct _ConstraintClassRec *ConstraintWidgetClass;
 
-#ifndef CONSTRAINT
+#ifndef VMS
 externalref WidgetClass constraintWidgetClass;
 #endif
 
+_XFUNCPROTOEND
+
 #endif /* _XtConstraint_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ConvertI.h b/recipes/xorg-lib/xorg-headers-native/X11/ConvertI.h
index 02c0e5ca08..f3f7fb0bae 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ConvertI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ConvertI.h
@@ -48,6 +48,8 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
 
+_XFUNCPROTOBEGIN
+
 /* Representation types */
 
 extern	XrmQuark  _XtQString;
@@ -94,3 +96,4 @@ extern Boolean _XtConvert(
 
 void _XtConvertInitialize(void);
 
+_XFUNCPROTOEND
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Core.h b/recipes/xorg-lib/xorg-headers-native/X11/Core.h
index ff6cb75356..5127b501ad 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Core.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Core.h
@@ -53,14 +53,18 @@ SOFTWARE.
 #ifndef _XtCore_h
 #define _XtCore_h
 
+_XFUNCPROTOBEGIN
+
 typedef struct _WidgetClassRec *CoreWidgetClass;
 typedef struct _WidgetRec *CoreWidget;
 externalref WidgetClass coreWidgetClass;
 
-#ifndef _XT_CORE_C
+#ifndef VMS
 externalref WidgetClass widgetClass;
 
 #endif
 
+_XFUNCPROTOEND
+
 #endif /* _XtCore_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/CoreP.h b/recipes/xorg-lib/xorg-headers-native/X11/CoreP.h
index e07f085e6e..57836e615a 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/CoreP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/CoreP.h
@@ -55,6 +55,8 @@ SOFTWARE.
 
 #include <X11/Core.h>
 
+_XFUNCPROTOBEGIN
+
 externalref int _XtInheritTranslations;
 
 #define XtInheritTranslations  ((String) &_XtInheritTranslations)
@@ -167,5 +169,7 @@ typedef struct _WidgetClassRec {
 externalref WidgetClassRec widgetClassRec;
 #define coreClassRec widgetClassRec
 
+_XFUNCPROTOEND
+
 #endif /* _XtCoreP_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/CreateI.h b/recipes/xorg-lib/xorg-headers-native/X11/CreateI.h
index 87abb1d2d5..e0ca9a3a60 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/CreateI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/CreateI.h
@@ -3,6 +3,8 @@
 #ifndef _XtcreateI_h
 #define _XtcreateI_h
 
+_XFUNCPROTOBEGIN
+
 extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
 			      Widget parent, ArgList args, Cardinal num_args,
 			      XtTypedArgList typed_args,
@@ -18,9 +20,12 @@ extern Widget _XtAppCreateShell(String name, String class,
 				Cardinal num_typed_args);
 extern Widget _XtCreateHookObj(Screen *screen);
 
+_XFUNCPROTOEND
 
 #include <stdarg.h>
 
+_XFUNCPROTOBEGIN
+
 /* VarCreate.c */
 extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
 			_Xconst char* application_class,
@@ -34,4 +39,6 @@ extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
 			int *argc_in_out, String *argv_in_out,
 			String *fallback_resources, va_list var_args);
 
+_XFUNCPROTOEND
+
 #endif /* _XtcreateI_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/DECkeysym.h b/recipes/xorg-lib/xorg-headers-native/X11/DECkeysym.h
index 6ab103e5df..07307169d3 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/DECkeysym.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/DECkeysym.h
@@ -1,5 +1,3 @@
-/* $Xorg: DECkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-
 /***********************************************************
 
 Copyright 1988, 1998  The Open Group
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/EventI.h b/recipes/xorg-lib/xorg-headers-native/X11/EventI.h
index 00858e71ea..d2d1d0f439 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/EventI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/EventI.h
@@ -65,6 +65,8 @@ typedef struct _XtGrabRec  *XtGrabList;
 
 #include "PassivGraI.h"
 
+_XFUNCPROTOBEGIN
+
 extern void _XtEventInitialize(
     void
 );
@@ -131,4 +133,6 @@ extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
 /* NextEvent.c */
 extern Boolean XtAppPeekEvent_SkipTimer;
 
+_XFUNCPROTOEND
+
 #endif /* _Event_h_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/HPkeysym.h b/recipes/xorg-lib/xorg-headers-native/X11/HPkeysym.h
index 2d09277d83..ed000b167b 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/HPkeysym.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/HPkeysym.h
@@ -1,4 +1,3 @@
-/* $Xorg: HPkeysym.h,v 1.5 2001/02/09 02:03:22 xorgcvs Exp $ */
 /*
 
 Copyright 1987, 1998  The Open Group
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/HookObjI.h b/recipes/xorg-lib/xorg-headers-native/X11/HookObjI.h
index c9a22a2565..c0858c2b56 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/HookObjI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/HookObjI.h
@@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group.
 #ifndef _XtHookObjI_h
 #define _XtHookObjI_h
 
+_XFUNCPROTOBEGIN
+
 /* This object is implementation-dependent and private to the library. */
 
 typedef struct _HookObjRec *HookObject;
@@ -66,6 +68,8 @@ typedef struct _HookObjClassRec {
 
 externalref HookObjClassRec hookObjClassRec;
 
+_XFUNCPROTOEND
+
 #endif /* ifndef _Xt_HookObjI_h */
 
 
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ImUtil.h b/recipes/xorg-lib/xorg-headers-native/X11/ImUtil.h
index 89f0381177..5b62571acb 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ImUtil.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ImUtil.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/X11/ImUtil.h,v 1.2 2003/04/15 22:10:07 herrb Exp $ */
 
 #ifndef _IMUTIL_H_
 #define _IMUTIL_H_
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/InitialI.h b/recipes/xorg-lib/xorg-headers-native/X11/InitialI.h
index c2fe47c1ba..2ae9b743cb 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/InitialI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/InitialI.h
@@ -84,6 +84,8 @@ SOFTWARE.
 #include <X11/Xos.h>
 #include <X11/Xpoll.h>
 
+_XFUNCPROTOBEGIN
+
 typedef struct _TimerEventRec {
         struct timeval        te_timer_value;
 	struct _TimerEventRec *te_next;
@@ -426,4 +428,6 @@ extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
 			String *applName, String *displayName,
 			String *language);
 
+_XFUNCPROTOEND
+
 #endif /* _XtinitialI_h */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/IntrinsicI.h b/recipes/xorg-lib/xorg-headers-native/X11/IntrinsicI.h
index d749867b85..d88166fc36 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/IntrinsicI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/IntrinsicI.h
@@ -194,6 +194,8 @@ SOFTWARE.
 #define ERRORDB "/usr/lib/X11/XtErrorDB"
 #endif
 
+_XFUNCPROTOBEGIN
+
 extern String XtCXtToolkitError;
 
 extern void _XtAllocError(
@@ -257,5 +259,7 @@ extern char* __XtCalloc (
 #define __XtCalloc XtCalloc
 #endif
 
+_XFUNCPROTOEND
+
 #endif /* _XtintrinsicI_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/Object.h b/recipes/xorg-lib/xorg-headers-native/X11/Object.h
index 96723b16e5..5ef65de3c4 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/Object.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/Object.h
@@ -50,11 +50,16 @@ SOFTWARE.
 #ifndef _XtObject_h
 #define _XtObject_h
 
+_XFUNCPROTOBEGIN
+
 typedef struct _ObjectRec *Object;
 typedef struct _ObjectClassRec *ObjectClass;
 
-#ifndef OBJECT
+#ifndef VMS
 externalref WidgetClass objectClass;
 #endif
+
+_XFUNCPROTOEND
+
 #endif /* _XtObject_h */
 /* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/ObjectP.h b/recipes/xorg-lib/xorg-headers-native/X11/ObjectP.h
index a24564ef29..0f484d2fd5 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/ObjectP.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/ObjectP.h
@@ -52,6 +52,8 @@ SOFTWARE.
 
 #include <X11/Object.h>
 
+_XFUNCPROTOBEGIN
+
 /**********************************************************
  * Object Instance Data Structures
  *
@@ -132,6 +134,8 @@ typedef struct _ObjectClassRec {
 
 externalref ObjectClassRec objectClassRec;
 
+_XFUNCPROTOEND
+
 #define XtObjectExtensionVersion 1L
 #define XtInheritAllocate ((XtAllocateProc) _XtInherit)
 #define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/PassivGraI.h b/recipes/xorg-lib/xorg-headers-native/X11/PassivGraI.h
index 02e2964845..10591ac4d2 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/PassivGraI.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/PassivGraI.h
@@ -60,6 +60,8 @@ in this Software without prior written authorization from The Open Group.
 #define KEYBOARD TRUE
 #define POINTER  FALSE
 
+_XFUNCPROTOBEGIN
+
 typedef enum {
     XtNoServerGrab, 
     XtPassiveServerGrab,
@@ -183,4 +185,6 @@ extern void _XtClearAncestorCache(
     Widget		/* widget */
 );
 
+_XFUNCPROTOEND
+
 #endif /* _PDI_h_ */
diff --git a/recipes/xorg-lib/xorg-headers-native/X11/RectObj.h b/recipes/xorg-lib/xorg-headers-native/X11/RectObj.h
index 07615fab74..81e43a5e24 100644
--- a/recipes/xorg-lib/xorg-headers-native/X11/RectObj.h
+++ b/recipes/xorg-lib/xorg-headers-native/X11/RectObj.h
@@ -50,11 +50,16 @@ SOFTWARE.
 #ifndef _XtRect_h
 #define _XtRect_h
 
+_XFUNCPROTOBEGIN
+
 typedef struct _RectObjRec *RectObj;
 typedef struct _RectObjClassRec *RectObjClass;
 
-#ifndef RECTOBJ
+#ifndef VMS
 externalref WidgetClass rectObjClass;
 #endif
+
+_