recipes/xorg-lib/libxt/pr10970-header-fix.patch

   1 diff --git a/include/X11/CallbackI.h b/include/X11/CallbackI.h
   2 index 4ae08ab..64e8152 100644
   3 --- a/include/X11/CallbackI.h
   4 +++ b/include/X11/CallbackI.h
   5 @@ -58,6 +58,8 @@ typedef XrmResource **CallbackTable;
   6  #define _XtCBCalling 1
   7  #define _XtCBFreeAfterCalling 2
   8
   9 +_XFUNCPROTOBEGIN
  10 +
  11  typedef struct internalCallbackRec {
  12      unsigned short count;
  13      char          is_padded;   /* contains NULL padding for external form */
  14 @@ -115,3 +117,5 @@ extern void _XtCallConditionalCallbackList(
  15      XtPointer                  /* call_data */,
  16      _XtConditionProc           /* cond_proc */
  17  );
  18 +
  19 +_XFUNCPROTOEND
  20 diff --git a/include/X11/CompositeP.h b/include/X11/CompositeP.h
  21 index ed055b2..e93275a 100644
  22 --- a/include/X11/CompositeP.h
  23 +++ b/include/X11/CompositeP.h
  24 @@ -52,6 +52,8 @@ SOFTWARE.
  25
  26  #include <X11/Composite.h>
  27
  28 +_XFUNCPROTOBEGIN
  29 +
  30  /************************************************************************
  31   *
  32   * Additional instance fields for widgets of (sub)class 'Composite'
  33 @@ -101,6 +103,8 @@ typedef struct _CompositeClassRec {
  34
  35  externalref CompositeClassRec compositeClassRec;
  36
  37 +_XFUNCPROTOEND
  38 +
  39  #define XtCompositeExtensionVersion 2L
  40  #define XtInheritGeometryManager ((XtGeometryHandler) _XtInherit)
  41  #define XtInheritChangeManaged ((XtWidgetProc) _XtInherit)
  42 diff --git a/include/X11/ConstrainP.h b/include/X11/ConstrainP.h
  43 index a90d19a..7030a34 100644
  44 --- a/include/X11/ConstrainP.h
  45 +++ b/include/X11/ConstrainP.h
  46 @@ -52,6 +52,8 @@ SOFTWARE.
  47
  48  #include <X11/Constraint.h>
  49
  50 +_XFUNCPROTOBEGIN
  51 +
  52  typedef struct _ConstraintPart {
  53      XtPointer   mumble;                /* No new fields, keep C compiler happy */
  54  } ConstraintPart;
  55 @@ -88,6 +90,8 @@ typedef struct _ConstraintClassRec {
  56
  57  externalref ConstraintClassRec constraintClassRec;
  58
  59 +_XFUNCPROTOEND
  60 +
  61  #define XtConstraintExtensionVersion 1L
  62
  63  #endif /* _XtConstraintP_h */
  64 diff --git a/include/X11/Constraint.h b/include/X11/Constraint.h
  65 index 9bb962e..b8bd902 100644
  66 --- a/include/X11/Constraint.h
  67 +++ b/include/X11/Constraint.h
  68 @@ -50,11 +50,15 @@ SOFTWARE.
  69  #ifndef _XtConstraint_h
  70  #define _XtConstraint_h
  71
  72 +_XFUNCPROTOBEGIN
  73 +
  74  typedef struct _ConstraintClassRec *ConstraintWidgetClass;
  75
  76  #ifndef CONSTRAINT
  77  externalref WidgetClass constraintWidgetClass;
  78  #endif
  79
  80 +_XFUNCPROTOEND
  81 +
  82  #endif /* _XtConstraint_h */
  83  /* DON'T ADD STUFF AFTER THIS #endif */
  84 diff --git a/include/X11/ConvertI.h b/include/X11/ConvertI.h
  85 index 02c0e5c..f3f7fb0 100644
  86 --- a/include/X11/ConvertI.h
  87 +++ b/include/X11/ConvertI.h
  88 @@ -48,6 +48,8 @@ SOFTWARE.
  89  ******************************************************************/
  90  /* $XFree86: xc/lib/Xt/ConvertI.h,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
  91
  92 +_XFUNCPROTOBEGIN
  93 +
  94  /* Representation types */
  95
  96  extern XrmQuark  _XtQString;
  97 @@ -94,3 +96,4 @@ extern Boolean _XtConvert(
  98
  99  void _XtConvertInitialize(void);
 100
 101 +_XFUNCPROTOEND
 102 diff --git a/include/X11/Core.h b/include/X11/Core.h
 103 index ff6cb75..e1a7c28 100644
 104 --- a/include/X11/Core.h
 105 +++ b/include/X11/Core.h
 106 @@ -53,6 +53,8 @@ SOFTWARE.
 107  #ifndef _XtCore_h
 108  #define _XtCore_h
 109
 110 +_XFUNCPROTOBEGIN
 111 +
 112  typedef struct _WidgetClassRec *CoreWidgetClass;
 113  typedef struct _WidgetRec *CoreWidget;
 114  externalref WidgetClass coreWidgetClass;
 115 @@ -62,5 +64,7 @@ externalref WidgetClass widgetClass;
 116
 117  #endif
 118
 119 +_XFUNCPROTOEND
 120 +
 121  #endif /* _XtCore_h */
 122  /* DON'T ADD STUFF AFTER THIS #endif */
 123 diff --git a/include/X11/CoreP.h b/include/X11/CoreP.h
 124 index e07f085..57836e6 100644
 125 --- a/include/X11/CoreP.h
 126 +++ b/include/X11/CoreP.h
 127 @@ -55,6 +55,8 @@ SOFTWARE.
 128
 129  #include <X11/Core.h>
 130
 131 +_XFUNCPROTOBEGIN
 132 +
 133  externalref int _XtInheritTranslations;
 134
 135  #define XtInheritTranslations  ((String) &_XtInheritTranslations)
 136 @@ -167,5 +169,7 @@ typedef struct _WidgetClassRec {
 137  externalref WidgetClassRec widgetClassRec;
 138  #define coreClassRec widgetClassRec
 139
 140 +_XFUNCPROTOEND
 141 +
 142  #endif /* _XtCoreP_h */
 143  /* DON'T ADD STUFF AFTER THIS #endif */
 144 diff --git a/include/X11/CreateI.h b/include/X11/CreateI.h
 145 index 87abb1d..e0ca9a3 100644
 146 --- a/include/X11/CreateI.h
 147 +++ b/include/X11/CreateI.h
 148 @@ -3,6 +3,8 @@
 149  #ifndef _XtcreateI_h
 150  #define _XtcreateI_h
 151
 152 +_XFUNCPROTOBEGIN
 153 +
 154  extern Widget _XtCreateWidget(String name, WidgetClass widget_class,
 155                               Widget parent, ArgList args, Cardinal num_args,
 156                               XtTypedArgList typed_args,
 157 @@ -18,9 +20,12 @@ extern Widget _XtAppCreateShell(String name, String class,
 158                                 Cardinal num_typed_args);
 159  extern Widget _XtCreateHookObj(Screen *screen);
 160
 161 +_XFUNCPROTOEND
 162
 163  #include <stdarg.h>
 164
 165 +_XFUNCPROTOBEGIN
 166 +
 167  /* VarCreate.c */
 168  extern Widget _XtVaOpenApplication(XtAppContext *app_context_return,
 169                         _Xconst char* application_class,
 170 @@ -34,4 +39,6 @@ extern Widget _XtVaAppInitialize(XtAppContext *app_context_return,
 171                         int *argc_in_out, String *argv_in_out,
 172                         String *fallback_resources, va_list var_args);
 173
 174 +_XFUNCPROTOEND
 175 +
 176  #endif /* _XtcreateI_h */
 177 diff --git a/include/X11/EventI.h b/include/X11/EventI.h
 178 index 00858e7..d2d1d0f 100644
 179 --- a/include/X11/EventI.h
 180 +++ b/include/X11/EventI.h
 181 @@ -65,6 +65,8 @@ typedef struct _XtGrabRec  *XtGrabList;
 182
 183  #include "PassivGraI.h"
 184
 185 +_XFUNCPROTOBEGIN
 186 +
 187  extern void _XtEventInitialize(
 188      void
 189  );
 190 @@ -131,4 +133,6 @@ extern void _XtFillAncestorList(Widget **listPtr, int *maxElemsPtr,
 191  /* NextEvent.c */
 192  extern Boolean XtAppPeekEvent_SkipTimer;
 193
 194 +_XFUNCPROTOEND
 195 +
 196  #endif /* _Event_h_ */
 197 diff --git a/include/X11/HookObjI.h b/include/X11/HookObjI.h
 198 index c9a22a2..c0858c2 100644
 199 --- a/include/X11/HookObjI.h
 200 +++ b/include/X11/HookObjI.h
 201 @@ -29,6 +29,8 @@ in this Software without prior written authorization from The Open Group.
 202  #ifndef _XtHookObjI_h
 203  #define _XtHookObjI_h
 204
 205 +_XFUNCPROTOBEGIN
 206 +
 207  /* This object is implementation-dependent and private to the library. */
 208
 209  typedef struct _HookObjRec *HookObject;
 210 @@ -66,6 +68,8 @@ typedef struct _HookObjClassRec {
 211
 212  externalref HookObjClassRec hookObjClassRec;
 213
 214 +_XFUNCPROTOEND
 215 +
 216  #endif /* ifndef _Xt_HookObjI_h */
 217
 218
 219 diff --git a/include/X11/InitialI.h b/include/X11/InitialI.h
 220 index c2fe47c..2ae9b74 100644
 221 --- a/include/X11/InitialI.h
 222 +++ b/include/X11/InitialI.h
 223 @@ -84,6 +84,8 @@ SOFTWARE.
 224  #include <X11/Xos.h>
 225  #include <X11/Xpoll.h>
 226
 227 +_XFUNCPROTOBEGIN
 228 +
 229  typedef struct _TimerEventRec {
 230          struct timeval        te_timer_value;
 231         struct _TimerEventRec *te_next;
 232 @@ -426,4 +428,6 @@ extern XrmDatabase _XtPreparseCommandLine(XrmOptionDescRec *urlist,
 233                         String *applName, String *displayName,
 234                         String *language);
 235
 236 +_XFUNCPROTOEND
 237 +
 238  #endif /* _XtinitialI_h */
 239 diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h
 240 index d749867..d88166f 100644
 241 --- a/include/X11/IntrinsicI.h
 242 +++ b/include/X11/IntrinsicI.h
 243 @@ -194,6 +194,8 @@ SOFTWARE.
 244  #define ERRORDB "/usr/lib/X11/XtErrorDB"
 245  #endif
 246
 247 +_XFUNCPROTOBEGIN
 248 +
 249  extern String XtCXtToolkitError;
 250
 251  extern void _XtAllocError(
 252 @@ -257,5 +259,7 @@ extern char* __XtCalloc (
 253  #define __XtCalloc XtCalloc
 254  #endif
 255
 256 +_XFUNCPROTOEND
 257 +
 258  #endif /* _XtintrinsicI_h */
 259  /* DON'T ADD STUFF AFTER THIS #endif */
 260 diff --git a/include/X11/Object.h b/include/X11/Object.h
 261 index 96723b1..2c84aaf 100644
 262 --- a/include/X11/Object.h
 263 +++ b/include/X11/Object.h
 264 @@ -50,11 +50,16 @@ SOFTWARE.
 265  #ifndef _XtObject_h
 266  #define _XtObject_h
 267
 268 +_XFUNCPROTOBEGIN
 269 +
 270  typedef struct _ObjectRec *Object;
 271  typedef struct _ObjectClassRec *ObjectClass;
 272
 273  #ifndef OBJECT
 274  externalref WidgetClass objectClass;
 275  #endif
 276 +
 277 +_XFUNCPROTOEND
 278 +
 279  #endif /* _XtObject_h */
 280  /* DON'T ADD STUFF AFTER THIS #endif */
 281 diff --git a/include/X11/ObjectP.h b/include/X11/ObjectP.h
 282 index a24564e..0f484d2 100644
 283 --- a/include/X11/ObjectP.h
 284 +++ b/include/X11/ObjectP.h
 285 @@ -52,6 +52,8 @@ SOFTWARE.
 286
 287  #include <X11/Object.h>
 288
 289 +_XFUNCPROTOBEGIN
 290 +
 291  /**********************************************************
 292   * Object Instance Data Structures
 293   *
 294 @@ -132,6 +134,8 @@ typedef struct _ObjectClassRec {
 295
 296  externalref ObjectClassRec objectClassRec;
 297
 298 +_XFUNCPROTOEND
 299 +
 300  #define XtObjectExtensionVersion 1L
 301  #define XtInheritAllocate ((XtAllocateProc) _XtInherit)
 302  #define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
 303 diff --git a/include/X11/PassivGraI.h b/include/X11/PassivGraI.h
 304 index 02e2964..10591ac 100644
 305 --- a/include/X11/PassivGraI.h
 306 +++ b/include/X11/PassivGraI.h
 307 @@ -60,6 +60,8 @@ in this Software without prior written authorization from The Open Group.
 308  #define KEYBOARD TRUE
 309  #define POINTER  FALSE
 310
 311 +_XFUNCPROTOBEGIN
 312 +
 313  typedef enum {
 314      XtNoServerGrab,
 315      XtPassiveServerGrab,
 316 @@ -183,4 +185,6 @@ extern void _XtClearAncestorCache(
 317      Widget             /* widget */
 318  );
 319
 320 +_XFUNCPROTOEND
 321 +
 322  #endif /* _PDI_h_ */
 323 diff --git a/include/X11/RectObj.h b/include/X11/RectObj.h
 324 index 07615fa..dced5c3 100644
 325 --- a/include/X11/RectObj.h
 326 +++ b/include/X11/RectObj.h
 327 @@ -50,11 +50,16 @@ SOFTWARE.
 328  #ifndef _XtRect_h
 329  #define _XtRect_h
 330
 331 +_XFUNCPROTOBEGIN
 332 +
 333  typedef struct _RectObjRec *RectObj;
 334  typedef struct _RectObjClassRec *RectObjClass;
 335
 336  #ifndef RECTOBJ
 337  externalref WidgetClass rectObjClass;
 338  #endif
 339 +
 340 +_XFUNCPROTOEND
 341 +
 342  #endif /* _XtRect_h */
 343  /* DON'T ADD STUFF AFTER THIS #endif */
 344 diff --git a/include/X11/RectObjP.h b/include/X11/RectObjP.h
 345 index ca3b8ad..d6ffb78 100644
 346 --- a/include/X11/RectObjP.h
 347 +++ b/include/X11/RectObjP.h
 348 @@ -53,6 +53,8 @@ SOFTWARE.
 349  #include <X11/RectObj.h>
 350  #include <X11/ObjectP.h>
 351
 352 +_XFUNCPROTOBEGIN
 353 +
 354  /**********************************************************
 355   * Rectangle Object Instance Data Structures
 356   *
 357 @@ -126,4 +128,6 @@ typedef struct _RectObjClassRec {
 358
 359  externalref RectObjClassRec rectObjClassRec;
 360
 361 +_XFUNCPROTOEND
 362 +
 363  #endif /*_Xt_RectObjP_h_*/
 364 diff --git a/include/X11/ResourceI.h b/include/X11/ResourceI.h
 365 index d6ed1df..3db97f8 100644
 366 --- a/include/X11/ResourceI.h
 367 +++ b/include/X11/ResourceI.h
 368 @@ -61,6 +61,8 @@ SOFTWARE.
 369  #define StringToName(string) XrmStringToName(string)
 370  #define StringToClass(string) XrmStringToClass(string)
 371
 372 +_XFUNCPROTOBEGIN
 373 +
 374  extern void _XtDependencies(
 375      XtResourceList  * /* class_resp */,
 376      Cardinal       * /* class_num_resp */,
 377 @@ -96,5 +98,6 @@ extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
 378                                                   Cardinal num_resources);
 379  extern void _XtResourceListInitialize(void);
 380
 381 +_XFUNCPROTOEND
 382
 383  #endif /* _XtresourceI_h */
 384 diff --git a/include/X11/ShellP.h b/include/X11/ShellP.h
 385 index 2b08c3f..7297d33 100644
 386 --- a/include/X11/ShellP.h
 387 +++ b/include/X11/ShellP.h
 388 @@ -67,6 +67,8 @@ SOFTWARE.
 389   * *****
 390   */
 391
 392 +_XFUNCPROTOBEGIN
 393 +
 394  /***********************************************************************
 395   *
 396   * Shell Widget Private Data
 397 @@ -214,8 +216,12 @@ typedef  struct {
 398         WMShellPart     wm;
 399  } WMShellRec, *WMShellWidget;
 400
 401 +_XFUNCPROTOEND
 402 +
 403  #include <X11/VendorP.h>
 404
 405 +_XFUNCPROTOBEGIN
 406 +
 407  /***********************************************************************
 408   *
 409   * TransientShell Widget Private Data
 410 @@ -425,4 +431,6 @@ typedef  struct {
 411         SessionShellPart session;
 412  } SessionShellRec, *SessionShellWidget;
 413
 414 +_XFUNCPROTOEND
 415 +
 416  #endif /* _XtShellPrivate_h */
 417 diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h
 418 index 1492d77..28cbc98 100644
 419 --- a/include/X11/ThreadsI.h
 420 +++ b/include/X11/ThreadsI.h
 421 @@ -81,6 +81,8 @@ typedef void (*ThreadAppRestoreLockProc)(
 422      Boolean* /* pushed_thread */
 423  );
 424
 425 +_XFUNCPROTOBEGIN
 426 +
 427  extern void (*_XtProcessLock)(
 428      void
 429  );
 430 @@ -93,6 +95,8 @@ extern void (*_XtInitAppLock)(
 431      XtAppContext /* app */
 432  );
 433
 434 +_XFUNCPROTOEND
 435 +
 436  #define INIT_APP_LOCK(app) if(_XtInitAppLock) (*_XtInitAppLock)(app)
 437  #define FREE_APP_LOCK(app) if(app && app->free_lock)(*app->free_lock)(app)
 438
 439 diff --git a/include/X11/TranslateI.h b/include/X11/TranslateI.h
 440 index 1224875..6cc3099 100644
 441 --- a/include/X11/TranslateI.h
 442 +++ b/include/X11/TranslateI.h
 443 @@ -342,6 +342,8 @@ typedef struct _TMGlobalRec{
 444  #endif /* TRACE_TM */
 445  }TMGlobalRec;
 446
 447 +_XFUNCPROTOBEGIN
 448 +
 449  extern TMGlobalRec _XtGlobalTM;
 450
 451  #define TM_MOD_SEGMENT_SIZE    16
 452 @@ -604,3 +606,4 @@ extern void _XtUnmergeTranslations(
 453  /* TMKey.c */
 454  extern void _XtAllocTMContext(XtPerDisplay pd);
 455
 456 +_XFUNCPROTOEND
 457 diff --git a/include/X11/VarargsI.h b/include/X11/VarargsI.h
 458 index e15404a..76ce9bc 100644
 459 --- a/include/X11/VarargsI.h
 460 +++ b/include/X11/VarargsI.h
 461 @@ -34,6 +34,8 @@ in this Software without prior written authorization from The Open Group.
 462
 463  /* private routines */
 464
 465 +_XFUNCPROTOBEGIN
 466 +
 467  extern void _XtCountVaList(
 468      va_list /*var*/, int* /*total_count*/, int* /*typed_count*/
 469  );
 470 @@ -62,4 +64,6 @@ extern void _XtGetSubresources(
 471      Widget /*w*/, XtPointer /*base*/, const char* /*name*/, const char* /*class*/, XtResourceList /*resources*/, Cardinal /*num_resources*/, ArgList /*args*/, Cardinal /*num_args*/, XtTypedArgList /*typed_args*/, Cardinal /*num_typed_args*/
 472  );
 473
 474 +_XFUNCPROTOEND
 475 +
 476  #endif /* _VarargsI_h_ */
 477 diff --git a/include/X11/Vendor.h b/include/X11/Vendor.h
 478 index 65e7c38..633d17a 100644
 479 --- a/include/X11/Vendor.h
 480 +++ b/include/X11/Vendor.h
 481 @@ -65,7 +65,11 @@ SOFTWARE.
 482
 483  typedef struct _VendorShellClassRec *VendorShellWidgetClass;
 484
 485 +_XFUNCPROTOBEGIN
 486 +
 487  externalref WidgetClass vendorShellWidgetClass;
 488
 489 +_XFUNCPROTOEND
 490 +
 491  #endif /* _XtVendor_h */
 492  /* DON'T ADD STUFF AFTER THIS #endif */
 493 diff --git a/include/X11/VendorP.h b/include/X11/VendorP.h
 494 index 08bf689..e60857d 100644
 495 --- a/include/X11/VendorP.h
 496 +++ b/include/X11/VendorP.h
 497 @@ -72,6 +72,8 @@ SOFTWARE.
 498
 499  /* New fields for the VendorShell widget class record */
 500
 501 +_XFUNCPROTOBEGIN
 502 +
 503  typedef struct {
 504      XtPointer       extension;          /* pointer to extension record      */
 505  } VendorShellClassPart;
 506 @@ -100,4 +102,6 @@ typedef  struct {
 507         VendorShellPart vendor;
 508  } VendorShellRec, *VendorShellWidget;
 509
 510 +_XFUNCPROTOEND
 511 +
 512  #endif  /* _XtVendorPrivate_h */