make wxTmemchr() return (and take) char* instead of void* in ANSI build too

[wxWidgets.git] / include / wx / vms_x_fix.h

diff --git a/include/wx/vms_x_fix.h b/include/wx/vms_x_fix.h
index 02825b4819bd1b4a79ce4d09e67048c1ca3a92b2..7abe9308169d31ed87dcfdfc240c0a3a3c2f448a 100644 (file)
--- a/include/wx/vms_x_fix.h
+++ b/include/wx/vms_x_fix.h
@@ -2,7 +2,7 @@
  *                                                                         *
  * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
  *                                                                         *
  *                                                                         *
  * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
  *                                                                         *

- * Last revision : 28 March 2003                                           *
+ * Last revision : 7 October 2005                                          *

  *                                                                         *
  * Repair definitions of Runtime library functions when compiling with     *
  * /name=(as_is) on OpenVMS                                                *
  *                                                                         *
  * Repair definitions of Runtime library functions when compiling with     *
  * /name=(as_is) on OpenVMS                                                *


@@ -12,7 +12,12 @@
 #ifndef VMS_X_FIX
 #define VMS_X_FIX
 
 #ifndef VMS_X_FIX
 #define VMS_X_FIX
 

+#define decw$_select DECW$_SELECT

 #define DtSaverGetWindows DTSAVERGETWINDOWS
 #define DtSaverGetWindows DTSAVERGETWINDOWS

+#define MrmFetchWidget MRMFETCHWIDGET
+#define MrmInitialize MRMINITIALIZE
+#define MrmOpenHierarchy MRMOPENHIERARCHY
+#define MrmRegisterNames MRMREGISTERNAMES

 #define XAddExtension XADDEXTENSION
 #define XAddHosts XADDHOSTS
 #define XAllocClassHint XALLOCCLASSHINT
 #define XAddExtension XADDEXTENSION
 #define XAddHosts XADDHOSTS
 #define XAllocClassHint XALLOCCLASSHINT


@@ -31,6 +36,7 @@
 #define XBitmapPad XBITMAPPAD
 #define XBlackPixel XBLACKPIXEL
 #define XBlackPixelOfScreen XBLACKPIXELOFSCREEN
 #define XBitmapPad XBITMAPPAD
 #define XBlackPixel XBLACKPIXEL
 #define XBlackPixelOfScreen XBLACKPIXELOFSCREEN

+#define XCellsOfScreen XCELLSOFSCREEN

 #define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB
 #define XChangeGC XCHANGEGC
 #define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL
 #define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB
 #define XChangeGC XCHANGEGC
 #define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL


@@ -39,6 +45,7 @@
 #define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
 #define XCheckIfEvent XCHECKIFEVENT
 #define XCheckMaskEvent XCHECKMASKEVENT
 #define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
 #define XCheckIfEvent XCHECKIFEVENT
 #define XCheckMaskEvent XCHECKMASKEVENT

+#define XCheckTypedEvent XCHECKTYPEDEVENT

 #define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT
 #define XCheckWindowEvent XCHECKWINDOWEVENT
 #define XClearArea XCLEARAREA
 #define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT
 #define XCheckWindowEvent XCHECKWINDOWEVENT
 #define XClearArea XCLEARAREA


@@ -57,6 +64,7 @@
 #define XCreateFontCursor XCREATEFONTCURSOR
 #define XCreateFontSet XCREATEFONTSET
 #define XCreateGC XCREATEGC
 #define XCreateFontCursor XCREATEFONTCURSOR
 #define XCreateFontSet XCREATEFONTSET
 #define XCreateGC XCREATEGC

+#define XCreateGlyphCursor XCREATEGLYPHCURSOR

 #define XCreateIC XCREATEIC
 #define XCreateImage XCREATEIMAGE
 #define XCreatePixmap XCREATEPIXMAP
 #define XCreateIC XCREATEIC
 #define XCreateImage XCREATEIMAGE
 #define XCreatePixmap XCREATEPIXMAP


@@ -68,12 +76,15 @@
 #define XDefaultColormap XDEFAULTCOLORMAP
 #define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN
 #define XDefaultDepth XDEFAULTDEPTH
 #define XDefaultColormap XDEFAULTCOLORMAP
 #define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN
 #define XDefaultDepth XDEFAULTDEPTH

+#define XDefaultDepthOfScreen XDEFAULTDEPTHOFSCREEN

 #define XDefaultGC XDEFAULTGC
 #define XDefaultRootWindow XDEFAULTROOTWINDOW
 #define XDefaultScreen XDEFAULTSCREEN
 #define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY
 #define XDefaultVisual XDEFAULTVISUAL
 #define XDefaultGC XDEFAULTGC
 #define XDefaultRootWindow XDEFAULTROOTWINDOW
 #define XDefaultScreen XDEFAULTSCREEN
 #define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY
 #define XDefaultVisual XDEFAULTVISUAL

+#define XDefaultVisualOfScreen XDEFAULTVISUALOFSCREEN

 #define XDefineCursor XDEFINECURSOR
 #define XDefineCursor XDEFINECURSOR

+#define XDeleteContext XDELETECONTEXT

 #define XDeleteProperty XDELETEPROPERTY
 #define XDestroyIC XDESTROYIC
 #define XDestroyRegion XDESTROYREGION
 #define XDeleteProperty XDELETEPROPERTY
 #define XDestroyIC XDESTROYIC
 #define XDestroyRegion XDESTROYREGION


@@ -84,8 +95,11 @@
 #define XDisplayHeight XDISPLAYHEIGHT
 #define XDisplayKeycodes XDISPLAYKEYCODES
 #define XDisplayName XDISPLAYNAME
 #define XDisplayHeight XDISPLAYHEIGHT
 #define XDisplayKeycodes XDISPLAYKEYCODES
 #define XDisplayName XDISPLAYNAME

+#define XDisplayOfIM XDISPLAYOFIM

 #define XDisplayOfScreen XDISPLAYOFSCREEN
 #define XDisplayOfScreen XDISPLAYOFSCREEN

+#define XDisplayString XDISPLAYSTRING

 #define XDisplayWidth XDISPLAYWIDTH
 #define XDisplayWidth XDISPLAYWIDTH

+#define XDoesBackingStore XDOESBACKINGSTORE

 #define XDrawArc XDRAWARC
 #define XDrawArcs XDRAWARCS
 #define XDrawImageString XDRAWIMAGESTRING
 #define XDrawArc XDRAWARC
 #define XDrawArcs XDRAWARCS
 #define XDrawImageString XDRAWIMAGESTRING


@@ -106,7 +120,10 @@
 #define XEnableAccessControl XENABLEACCESSCONTROL
 #define XEqualRegion XEQUALREGION
 #define XEventsQueued XEVENTSQUEUED
 #define XEnableAccessControl XENABLEACCESSCONTROL
 #define XEqualRegion XEQUALREGION
 #define XEventsQueued XEVENTSQUEUED

+#define XExtendedMaxRequestSize XEXTENDEDMAXREQUESTSIZE

 #define XExtentsOfFontSet XEXTENTSOFFONTSET
 #define XExtentsOfFontSet XEXTENTSOFFONTSET

+#define XFetchBuffer XFETCHBUFFER
+#define XFetchBytes XFETCHBYTES

 #define XFetchName XFETCHNAME
 #define XFillArc XFILLARC
 #define XFillArcs XFILLARCS
 #define XFetchName XFETCHNAME
 #define XFillArc XFILLARC
 #define XFillArcs XFILLARCS


@@ -132,6 +149,8 @@
 #define XFreeModifiermap XFREEMODIFIERMAP
 #define XFreePixmap XFREEPIXMAP
 #define XFreeStringList XFREESTRINGLIST
 #define XFreeModifiermap XFREEMODIFIERMAP
 #define XFreePixmap XFREEPIXMAP
 #define XFreeStringList XFREESTRINGLIST

+#define XGContextFromGC XGCONTEXTFROMGC
+#define XGeometry XGEOMETRY

 #define XGetAtomName XGETATOMNAME
 #define XGetCommand XGETCOMMAND
 #define XGetDefault XGETDEFAULT
 #define XGetAtomName XGETATOMNAME
 #define XGetCommand XGETCOMMAND
 #define XGetDefault XGETDEFAULT


@@ -152,14 +171,17 @@
 #define XGetModifierMapping XGETMODIFIERMAPPING
 #define XGetMotionEvents XGETMOTIONEVENTS
 #define XGetNormalHints XGETNORMALHINTS
 #define XGetModifierMapping XGETMODIFIERMAPPING
 #define XGetMotionEvents XGETMOTIONEVENTS
 #define XGetNormalHints XGETNORMALHINTS

+#define XGetPointerMapping XGETPOINTERMAPPING

 #define XGetRGBColormaps XGETRGBCOLORMAPS
 #define XGetScreenSaver XGETSCREENSAVER
 #define XGetSelectionOwner XGETSELECTIONOWNER
 #define XGetRGBColormaps XGETRGBCOLORMAPS
 #define XGetScreenSaver XGETSCREENSAVER
 #define XGetSelectionOwner XGETSELECTIONOWNER

+#define XGetStandardColormap XGETSTANDARDCOLORMAP

 #define XGetSubImage XGETSUBIMAGE
 #define XGetTextProperty XGETTEXTPROPERTY
 #define XGetVisualInfo XGETVISUALINFO
 #define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS
 #define XGetWMHints XGETWMHINTS
 #define XGetSubImage XGETSUBIMAGE
 #define XGetTextProperty XGETTEXTPROPERTY
 #define XGetVisualInfo XGETVISUALINFO
 #define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS
 #define XGetWMHints XGETWMHINTS

+#define XGetWMIconName XGETWMICONNAME

 #define XGetWMName XGETWMNAME
 #define XGetWMNormalHints XGETWMNORMALHINTS
 #define XGetWindowAttributes XGETWINDOWATTRIBUTES
 #define XGetWMName XGETWMNAME
 #define XGetWMNormalHints XGETWMNORMALHINTS
 #define XGetWindowAttributes XGETWINDOWATTRIBUTES


@@ -168,16 +190,21 @@
 #define XGrabKeyboard XGRABKEYBOARD
 #define XGrabPointer XGRABPOINTER
 #define XGrabServer XGRABSERVER
 #define XGrabKeyboard XGRABKEYBOARD
 #define XGrabPointer XGRABPOINTER
 #define XGrabServer XGRABSERVER

+#define XHeightMMOfScreen XHEIGHTMMOFSCREEN

 #define XHeightOfScreen XHEIGHTOFSCREEN
 #define XIconifyWindow XICONIFYWINDOW
 #define XIfEvent XIFEVENT
 #define XHeightOfScreen XHEIGHTOFSCREEN
 #define XIconifyWindow XICONIFYWINDOW
 #define XIfEvent XIFEVENT

+#define XInitExtension XINITEXTENSION
+#define XInitImage XINITIMAGE

 #define XInstallColormap XINSTALLCOLORMAP
 #define XInternAtom XINTERNATOM
 #define XInstallColormap XINSTALLCOLORMAP
 #define XInternAtom XINTERNATOM

+#define XInternAtoms XINTERNATOMS

 #define XIntersectRegion XINTERSECTREGION
 #define XKeycodeToKeysym XKEYCODETOKEYSYM
 #define XKeysymToKeycode XKEYSYMTOKEYCODE
 #define XKeysymToString XKEYSYMTOSTRING
 #define XKillClient XKILLCLIENT
 #define XIntersectRegion XINTERSECTREGION
 #define XKeycodeToKeysym XKEYCODETOKEYSYM
 #define XKeysymToKeycode XKEYSYMTOKEYCODE
 #define XKeysymToString XKEYSYMTOSTRING
 #define XKillClient XKILLCLIENT

+#define XListDepths XLISTDEPTHS

 #define XListFonts XLISTFONTS
 #define XListFontsWithInfo XLISTFONTSWITHINFO
 #define XListHosts XLISTHOSTS
 #define XListFonts XLISTFONTS
 #define XListFontsWithInfo XLISTFONTSWITHINFO
 #define XListHosts XLISTHOSTS


@@ -200,6 +227,8 @@
 #define XMoveResizeWindow XMOVERESIZEWINDOW
 #define XMoveWindow XMOVEWINDOW
 #define XNextEvent XNEXTEVENT
 #define XMoveResizeWindow XMOVERESIZEWINDOW
 #define XMoveWindow XMOVEWINDOW
 #define XNextEvent XNEXTEVENT

+#define XNextRequest XNEXTREQUEST
+#define XNoOp XNOOP

 #define XOffsetRegion XOFFSETREGION
 #define XOpenDevice XOPENDEVICE
 #define XOpenDisplay XOPENDISPLAY
 #define XOffsetRegion XOFFSETREGION
 #define XOpenDevice XOPENDEVICE
 #define XOpenDisplay XOPENDISPLAY


@@ -213,6 +242,9 @@
 #define XPolygonRegion XPOLYGONREGION
 #define XPutBackEvent XPUTBACKEVENT
 #define XPutImage XPUTIMAGE
 #define XPolygonRegion XPOLYGONREGION
 #define XPutBackEvent XPUTBACKEVENT
 #define XPutImage XPUTIMAGE

+#define XQLength XQLENGTH
+#define XQueryBestCursor XQUERYBESTCURSOR
+#define XQueryBestStipple XQUERYBESTSTIPPLE

 #define XQueryColor XQUERYCOLOR
 #define XQueryColors XQUERYCOLORS
 #define XQueryDeviceState XQUERYDEVICESTATE
 #define XQueryColor XQUERYCOLOR
 #define XQueryColors XQUERYCOLORS
 #define XQueryDeviceState XQUERYDEVICESTATE


@@ -233,6 +265,7 @@
 #define XResizeWindow XRESIZEWINDOW
 #define XResourceManagerString XRESOURCEMANAGERSTRING
 #define XRestackWindows XRESTACKWINDOWS
 #define XResizeWindow XRESIZEWINDOW
 #define XResourceManagerString XRESOURCEMANAGERSTRING
 #define XRestackWindows XRESTACKWINDOWS

+#define XRotateBuffers XROTATEBUFFERS

 #define XRootWindow XROOTWINDOW
 #define XRootWindowOfScreen XROOTWINDOWOFSCREEN
 #define XSaveContext XSAVECONTEXT
 #define XRootWindow XROOTWINDOW
 #define XRootWindowOfScreen XROOTWINDOWOFSCREEN
 #define XSaveContext XSAVECONTEXT


@@ -244,6 +277,7 @@
 #define XSelectInput XSELECTINPUT
 #define XSendEvent XSENDEVENT
 #define XServerVendor XSERVERVENDOR
 #define XSelectInput XSELECTINPUT
 #define XSendEvent XSENDEVENT
 #define XServerVendor XSERVERVENDOR

+#define XSetArcMode XSETARCMODE

 #define XSetBackground XSETBACKGROUND
 #define XSetClassHint XSETCLASSHINT
 #define XSetClipMask XSETCLIPMASK
 #define XSetBackground XSETBACKGROUND
 #define XSetClassHint XSETCLASSHINT
 #define XSetClipMask XSETCLIPMASK


@@ -269,6 +303,7 @@
 #define XSetNormalHints XSETNORMALHINTS
 #define XSetPlaneMask XSETPLANEMASK
 #define XSetRegion XSETREGION
 #define XSetNormalHints XSETNORMALHINTS
 #define XSetPlaneMask XSETPLANEMASK
 #define XSetRegion XSETREGION

+#define XSetRGBColormaps XSETRGBCOLORMAPS

 #define XSetScreenSaver XSETSCREENSAVER
 #define XSetSelectionOwner XSETSELECTIONOWNER
 #define XSetStandardProperties XSETSTANDARDPROPERTIES
 #define XSetScreenSaver XSETSCREENSAVER
 #define XSetSelectionOwner XSETSELECTIONOWNER
 #define XSetStandardProperties XSETSTANDARDPROPERTIES


@@ -276,8 +311,10 @@
 #define XSetStipple XSETSTIPPLE
 #define XSetSubwindowMode XSETSUBWINDOWMODE
 #define XSetTSOrigin XSETTSORIGIN
 #define XSetStipple XSETSTIPPLE
 #define XSetSubwindowMode XSETSUBWINDOWMODE
 #define XSetTSOrigin XSETTSORIGIN

+#define XSetTextProperty XSETTEXTPROPERTY

 #define XSetTile XSETTILE
 #define XSetTransientForHint XSETTRANSIENTFORHINT
 #define XSetTile XSETTILE
 #define XSetTransientForHint XSETTRANSIENTFORHINT

+#define XSetWMClientMachine XSETWMCLIENTMACHINE

 #define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS
 #define XSetWMHints XSETWMHINTS
 #define XSetWMIconName XSETWMICONNAME
 #define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS
 #define XSetWMHints XSETWMHINTS
 #define XSetWMIconName XSETWMICONNAME


@@ -285,21 +322,27 @@
 #define XSetWMNormalHints XSETWMNORMALHINTS
 #define XSetWMProperties XSETWMPROPERTIES
 #define XSetWMProtocols XSETWMPROTOCOLS
 #define XSetWMNormalHints XSETWMNORMALHINTS
 #define XSetWMProperties XSETWMPROPERTIES
 #define XSetWMProtocols XSETWMPROTOCOLS

+#define XSetWMSizeHints XSETWMSIZEHINTS

 #define XSetWindowBackground XSETWINDOWBACKGROUND
 #define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
 #define XSetWindowBorder XSETWINDOWBORDER
 #define XSetWindowBackground XSETWINDOWBACKGROUND
 #define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
 #define XSetWindowBorder XSETWINDOWBORDER

+#define XSetWindowBorderPixmap XSETWINDOWBORDERPIXMAP

 #define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH
 #define XSetWindowColormap XSETWINDOWCOLORMAP
 #define XShapeCombineMask XSHAPECOMBINEMASK
 #define XShapeCombineRectangles XSHAPECOMBINERECTANGLES
 #define XShapeGetRectangles XSHAPEGETRECTANGLES
 #define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH
 #define XSetWindowColormap XSETWINDOWCOLORMAP
 #define XShapeCombineMask XSHAPECOMBINEMASK
 #define XShapeCombineRectangles XSHAPECOMBINERECTANGLES
 #define XShapeGetRectangles XSHAPEGETRECTANGLES

+#define XShapeQueryExtension XSHAPEQUERYEXTENSION

 #define XShmAttach XSHMATTACH
 #define XShmCreateImage XSHMCREATEIMAGE
 #define XShmCreatePixmap XSHMCREATEPIXMAP
 #define XShmDetach XSHMDETACH
 #define XShmAttach XSHMATTACH
 #define XShmCreateImage XSHMCREATEIMAGE
 #define XShmCreatePixmap XSHMCREATEPIXMAP
 #define XShmDetach XSHMDETACH

+#define XShmGetEventBase XSHMGETEVENTBASE

 #define XShmPutImage XSHMPUTIMAGE
 #define XShmPutImage XSHMPUTIMAGE

+#define XShmQueryExtension XSHMQUERYEXTENSION

 #define XShmQueryVersion XSHMQUERYVERSION
 #define XShrinkRegion XSHRINKREGION
 #define XShmQueryVersion XSHMQUERYVERSION
 #define XShrinkRegion XSHRINKREGION

+#define XStoreBuffer XSTOREBUFFER

 #define XStoreBytes XSTOREBYTES
 #define XStoreColor XSTORECOLOR
 #define XStoreColors XSTORECOLORS
 #define XStoreBytes XSTOREBYTES
 #define XStoreColor XSTORECOLOR
 #define XStoreColors XSTORECOLORS


@@ -333,13 +376,21 @@
 #define XWarpPointer XWARPPOINTER
 #define XWhitePixel XWHITEPIXEL
 #define XWhitePixelOfScreen XWHITEPIXELOFSCREEN
 #define XWarpPointer XWARPPOINTER
 #define XWhitePixel XWHITEPIXEL
 #define XWhitePixelOfScreen XWHITEPIXELOFSCREEN

+#define XWidthMMOfScreen XWIDTHMMOFSCREEN

 #define XWidthOfScreen XWIDTHOFSCREEN
 #define XWindowEvent XWINDOWEVENT
 #define XWithdrawWindow XWITHDRAWWINDOW
 #define XXorRegion XXORREGION
 #define XWidthOfScreen XWIDTHOFSCREEN
 #define XWindowEvent XWINDOWEVENT
 #define XWithdrawWindow XWITHDRAWWINDOW
 #define XXorRegion XXORREGION

+#define XcmsQueryColor XCMSQUERYCOLOR
+#define XdbeAllocateBackBufferName XDBEALLOCATEBACKBUFFERNAME
+#define XdbeFreeVisualInfo XDBEFREEVISUALINFO
+#define XdbeGetVisualInfo XDBEGETVISUALINFO
+#define XdbeQueryExtension XDBEQUERYEXTENSION
+#define XdbeSwapBuffers XDBESWAPBUFFERS

 #define XextAddDisplay XEXTADDDISPLAY
 #define XextFindDisplay XEXTFINDDISPLAY
 #define XextRemoveDisplay XEXTREMOVEDISPLAY
 #define XextAddDisplay XEXTADDDISPLAY
 #define XextFindDisplay XEXTFINDDISPLAY
 #define XextRemoveDisplay XEXTREMOVEDISPLAY

+#define XkbSetDetectableAutoRepeat XKBSETDETECTABLEAUTOREPEAT

 #define XmActivateProtocol XMACTIVATEPROTOCOL
 #define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
 #define XmAddProtocols XMADDPROTOCOLS
 #define XmActivateProtocol XMACTIVATEPROTOCOL
 #define XmAddProtocolCallback XMADDPROTOCOLCALLBACK
 #define XmAddProtocols XMADDPROTOCOLS


@@ -356,6 +407,9 @@
 #define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY
 #define XmClipboardStartRetrieve XMCLIPBOARDSTARTRETRIEVE
 #define XmClipboardUnlock XMCLIPBOARDUNLOCK
 #define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY
 #define XmClipboardStartRetrieve XMCLIPBOARDSTARTRETRIEVE
 #define XmClipboardUnlock XMCLIPBOARDUNLOCK

+#define XmCommandError XMCOMMANDERROR
+#define XmCommandGetChild XMCOMMANDGETCHILD
+#define XmCommandSetValue XMCOMMANDSETVALUE

 #define XmCreateArrowButton XMCREATEARROWBUTTON
 #define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET
 #define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG
 #define XmCreateArrowButton XMCREATEARROWBUTTON
 #define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET
 #define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG


@@ -374,6 +428,7 @@
 #define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG
 #define XmCreateLabel XMCREATELABEL
 #define XmCreateLabelGadget XMCREATELABELGADGET
 #define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG
 #define XmCreateLabel XMCREATELABEL
 #define XmCreateLabelGadget XMCREATELABELGADGET

+#define XmCreateList XMCREATELIST

 #define XmCreateMainWindow XMCREATEMAINWINDOW
 #define XmCreateMenuBar XMCREATEMENUBAR
 #define XmCreateMessageBox XMCREATEMESSAGEBOX
 #define XmCreateMainWindow XMCREATEMAINWINDOW
 #define XmCreateMenuBar XMCREATEMENUBAR
 #define XmCreateMessageBox XMCREATEMESSAGEBOX


@@ -425,6 +480,7 @@
 #define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT
 #define XmFontListNextEntry XMFONTLISTNEXTENTRY
 #define XmGetColors XMGETCOLORS
 #define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT
 #define XmFontListNextEntry XMFONTLISTNEXTENTRY
 #define XmGetColors XMGETCOLORS

+#define XmGetColorCalculation XMGETCOLORCALCULATION

 #define XmGetFocusWidget XMGETFOCUSWIDGET
 #define XmGetMenuCursor XMGETMENUCURSOR
 #define XmGetPixmap XMGETPIXMAP
 #define XmGetFocusWidget XMGETFOCUSWIDGET
 #define XmGetMenuCursor XMGETMENUCURSOR
 #define XmGetPixmap XMGETPIXMAP


@@ -476,8 +532,10 @@
 #define XmRemoveTabGroup XMREMOVETABGROUP
 #define XmRepTypeGetId XMREPTYPEGETID
 #define XmRepTypeGetRecord XMREPTYPEGETRECORD
 #define XmRemoveTabGroup XMREMOVETABGROUP
 #define XmRepTypeGetId XMREPTYPEGETID
 #define XmRepTypeGetRecord XMREPTYPEGETRECORD

+#define XmRepTypeInstallTearOffModelCon XMREPTYPEINSTALLTEAROFFMODELCON

 #define XmRepTypeRegister XMREPTYPEREGISTER
 #define XmRepTypeValidValue XMREPTYPEVALIDVALUE
 #define XmRepTypeRegister XMREPTYPEREGISTER
 #define XmRepTypeValidValue XMREPTYPEVALIDVALUE

+#define XmScrollBarGetValues XMSCROLLBARGETVALUES

 #define XmScrollBarSetValues XMSCROLLBARSETVALUES
 #define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS
 #define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD
 #define XmScrollBarSetValues XMSCROLLBARSETVALUES
 #define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS
 #define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD


@@ -503,6 +561,7 @@
 #define XmStringLtoRCreate XMSTRINGLTORCREATE
 #define XmStringNConcat XMSTRINGNCONCAT
 #define XmStringSegmentCreate XMSTRINGSEGMENTCREATE
 #define XmStringLtoRCreate XMSTRINGLTORCREATE
 #define XmStringNConcat XMSTRINGNCONCAT
 #define XmStringSegmentCreate XMSTRINGSEGMENTCREATE

+#define XmStringSeparatorCreate XMSTRINGSEPARATORCREATE

 #define XmStringWidth XMSTRINGWIDTH
 #define XmTextClearSelection XMTEXTCLEARSELECTION
 #define XmTextCopy XMTEXTCOPY
 #define XmStringWidth XMSTRINGWIDTH
 #define XmTextClearSelection XMTEXTCLEARSELECTION
 #define XmTextCopy XMTEXTCOPY


@@ -547,6 +606,7 @@
 #define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION
 #define XmTextSetSelection XMTEXTSETSELECTION
 #define XmTextSetString XMTEXTSETSTRING
 #define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION
 #define XmTextSetSelection XMTEXTSETSELECTION
 #define XmTextSetString XMTEXTSETSTRING

+#define XmTextSetTopCharacter XMTEXTSETTOPCHARACTER

 #define XmTextShowPosition XMTEXTSHOWPOSITION
 #define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE
 #define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE
 #define XmTextShowPosition XMTEXTSHOWPOSITION
 #define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE
 #define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE


@@ -570,7 +630,10 @@
 #define Xmemory_free XMEMORY_FREE
 #define Xmemory_malloc XMEMORY_MALLOC
 #define XmuClientWindow XMUCLIENTWINDOW
 #define Xmemory_free XMEMORY_FREE
 #define Xmemory_malloc XMEMORY_MALLOC
 #define XmuClientWindow XMUCLIENTWINDOW

+#define XmuConvertStandardSelection XMUCONVERTSTANDARDSELECTION

 #define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP
 #define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP

+#define XmuInternAtom XMUINTERNATOM
+#define XmuInternStrings XMUINTERNSTRINGS

 #define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
 #define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE
 #define XrmCombineDatabase XRMCOMBINEDATABASE
 #define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
 #define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE
 #define XrmCombineDatabase XRMCOMBINEDATABASE


@@ -583,26 +646,31 @@
 #define XrmInitialize XRMINITIALIZE
 #define XrmMergeDatabases XRMMERGEDATABASES
 #define XrmParseCommand XRMPARSECOMMAND
 #define XrmInitialize XRMINITIALIZE
 #define XrmMergeDatabases XRMMERGEDATABASES
 #define XrmParseCommand XRMPARSECOMMAND

+#define XrmPermStringToQuark XRMPERMSTRINGTOQUARK

 #define XrmPutFileDatabase XRMPUTFILEDATABASE
 #define XrmPutLineResource XRMPUTLINERESOURCE
 #define XrmPutStringResource XRMPUTSTRINGRESOURCE
 #define XrmPutFileDatabase XRMPUTFILEDATABASE
 #define XrmPutLineResource XRMPUTLINERESOURCE
 #define XrmPutStringResource XRMPUTSTRINGRESOURCE

+#define XrmQGetResource XRMQGETRESOURCE

 #define XrmQPutStringResource XRMQPUTSTRINGRESOURCE
 #define XrmQuarkToString XRMQUARKTOSTRING
 #define XrmQPutStringResource XRMQPUTSTRINGRESOURCE
 #define XrmQuarkToString XRMQUARKTOSTRING

+#define XrmSetDatabase XRMSETDATABASE

 #define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST
 #define XrmStringToQuark XRMSTRINGTOQUARK
 #define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST
 #define XrmStringToQuark XRMSTRINGTOQUARK

-#define XrmStringToQuark XRMSTRINGTOQUARK

 #define XtAddCallback XTADDCALLBACK
 #define XtAddCallbacks XTADDCALLBACKS
 #define XtAddConverter XTADDCONVERTER
 #define XtAddEventHandler XTADDEVENTHANDLER
 #define XtAddExposureToRegion XTADDEXPOSURETOREGION
 #define XtAddGrab XTADDGRAB
 #define XtAddCallback XTADDCALLBACK
 #define XtAddCallbacks XTADDCALLBACKS
 #define XtAddConverter XTADDCONVERTER
 #define XtAddEventHandler XTADDEVENTHANDLER
 #define XtAddExposureToRegion XTADDEXPOSURETOREGION
 #define XtAddGrab XTADDGRAB

+#define XtAddRawEventHandler XTADDRAWEVENTHANDLER

 #define XtAllocateGC XTALLOCATEGC
 #define XtAppAddActions XTAPPADDACTIONS
 #define XtAppAddInput XTAPPADDINPUT
 #define XtAppAddTimeOut XTAPPADDTIMEOUT
 #define XtAppAddWorkProc XTAPPADDWORKPROC
 #define XtAppCreateShell XTAPPCREATESHELL
 #define XtAllocateGC XTALLOCATEGC
 #define XtAppAddActions XTAPPADDACTIONS
 #define XtAppAddInput XTAPPADDINPUT
 #define XtAppAddTimeOut XTAPPADDTIMEOUT
 #define XtAppAddWorkProc XTAPPADDWORKPROC
 #define XtAppCreateShell XTAPPCREATESHELL

+#define XtAppError XTAPPERROR
+#define XtAppErrorMsg XTAPPERRORMSG

 #define XtAppInitialize XTAPPINITIALIZE
 #define XtAppMainLoop XTAPPMAINLOOP
 #define XtAppNextEvent XTAPPNEXTEVENT
 #define XtAppInitialize XTAPPINITIALIZE
 #define XtAppMainLoop XTAPPMAINLOOP
 #define XtAppNextEvent XTAPPNEXTEVENT


@@ -611,35 +679,53 @@
 #define XtAppProcessEvent XTAPPPROCESSEVENT
 #define XtAppSetErrorHandler XTAPPSETERRORHANDLER
 #define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES
 #define XtAppProcessEvent XTAPPPROCESSEVENT
 #define XtAppSetErrorHandler XTAPPSETERRORHANDLER
 #define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES

+#define XtAppSetTypeConverter XTAPPSETTYPECONVERTER

 #define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER
 #define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER

+#define XtAppWarningMsg XTAPPWARNINGMSG

 #define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER
 #define XtAppWarning XTAPPWARNING
 #define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER
 #define XtAppWarning XTAPPWARNING

+#define XtAugmentTranslations XTAUGMENTTRANSLATIONS

 #define XtCallActionProc XTCALLACTIONPROC
 #define XtCallCallbackList XTCALLCALLBACKLIST
 #define XtCallCallbacks XTCALLCALLBACKS
 #define XtCallActionProc XTCALLACTIONPROC
 #define XtCallCallbackList XTCALLCALLBACKLIST
 #define XtCallCallbacks XTCALLCALLBACKS

+#define XtCallConverter XTCALLCONVERTER
+#define XtCalloc XTCALLOC 
+#ifndef NOXTDISPLAY
+#define XtClass XTCLASS
+#endif

 #define XtCloseDisplay XTCLOSEDISPLAY
 #define XtConfigureWidget XTCONFIGUREWIDGET
 #define XtCloseDisplay XTCLOSEDISPLAY
 #define XtConfigureWidget XTCONFIGUREWIDGET

+#define XtConvert XTCONVERT

 #define XtConvertAndStore XTCONVERTANDSTORE
 #define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT
 #define XtCreateManagedWidget XTCREATEMANAGEDWIDGET
 #define XtCreatePopupShell XTCREATEPOPUPSHELL
 #define XtCreateWidget XTCREATEWIDGET
 #define XtConvertAndStore XTCONVERTANDSTORE
 #define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT
 #define XtCreateManagedWidget XTCREATEMANAGEDWIDGET
 #define XtCreatePopupShell XTCREATEPOPUPSHELL
 #define XtCreateWidget XTCREATEWIDGET

+#define XtCreateWindow XTCREATEWINDOW
+#define XtCvtStringToFont XTCVTSTRINGTOFONT

 #define XtDatabase XTDATABASE
 #define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT
 #define XtDestroyWidget XTDESTROYWIDGET
 #define XtDisownSelection XTDISOWNSELECTION
 #define XtDispatchEvent XTDISPATCHEVENT
 #define XtDatabase XTDATABASE
 #define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT
 #define XtDestroyWidget XTDESTROYWIDGET
 #define XtDisownSelection XTDISOWNSELECTION
 #define XtDispatchEvent XTDISPATCHEVENT

+#ifndef NOXTDISPLAY
+#define XtDisplay XTDISPLAY
+#endif

 #define XtDisplayOfObject XTDISPLAYOFOBJECT
 #define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING
 #define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT
 #define XtError XTERROR
 #define XtDisplayOfObject XTDISPLAYOFOBJECT
 #define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING
 #define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT
 #define XtError XTERROR

+#define XtErrorMsg XTERRORMSG

 #define XtFree XTFREE
 #define XtGetActionKeysym XTGETACTIONKEYSYM
 #define XtGetActionList XTGETACTIONLIST
 #define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS
 #define XtGetApplicationResources XTGETAPPLICATIONRESOURCES
 #define XtFree XTFREE
 #define XtGetActionKeysym XTGETACTIONKEYSYM
 #define XtGetActionList XTGETACTIONLIST
 #define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS
 #define XtGetApplicationResources XTGETAPPLICATIONRESOURCES

+#define XtGetClassExtension XTGETCLASSEXTENSION
+#define XtGetConstraintResourceList XTGETCONSTRAINTRESOURCELIST

 #define XtGetGC XTGETGC
 #define XtGetMultiClickTime XTGETMULTICLICKTIME
 #define XtGetGC XTGETGC
 #define XtGetMultiClickTime XTGETMULTICLICKTIME

+#define XtGetResourceList XTGETRESOURCELIST

 #define XtGetSelectionValue XTGETSELECTIONVALUE
 #define XtGetSelectionValues XTGETSELECTIONVALUES
 #define XtGetSubresources XTGETSUBRESOURCES
 #define XtGetSelectionValue XTGETSELECTIONVALUE
 #define XtGetSelectionValues XTGETSELECTIONVALUES
 #define XtGetSubresources XTGETSUBRESOURCES


@@ -651,8 +737,13 @@
 #define XtInitialize XTINITIALIZE
 #define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS
 #define XtInsertEventHandler XTINSERTEVENTHANDLER
 #define XtInitialize XTINITIALIZE
 #define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS
 #define XtInsertEventHandler XTINSERTEVENTHANDLER

+#define XtInsertRawEventHandler XTINSERTRAWEVENTHANDLER
+#define XtInstallAccelerators XTINSTALLACCELERATORS

 #define XtIsManaged XTISMANAGED
 #define XtIsObject XTISOBJECT
 #define XtIsManaged XTISMANAGED
 #define XtIsObject XTISOBJECT

+#ifndef NOXTDISPLAY
+#define XtIsRealized XTISREALIZED
+#endif

 #define XtIsSensitive XTISSENSITIVE
 #define XtIsSubclass XTISSUBCLASS
 #define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED
 #define XtIsSensitive XTISSENSITIVE
 #define XtIsSubclass XTISSUBCLASS
 #define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED


@@ -666,9 +757,14 @@
 #define XtMoveWidget XTMOVEWIDGET
 #define XtName XTNAME
 #define XtNameToWidget XTNAMETOWIDGET
 #define XtMoveWidget XTMOVEWIDGET
 #define XtName XTNAME
 #define XtNameToWidget XTNAMETOWIDGET

+#define XtOpenApplication XTOPENAPPLICATION

 #define XtOpenDisplay XTOPENDISPLAY
 #define XtOverrideTranslations XTOVERRIDETRANSLATIONS
 #define XtOwnSelection XTOWNSELECTION
 #define XtOpenDisplay XTOPENDISPLAY
 #define XtOverrideTranslations XTOVERRIDETRANSLATIONS
 #define XtOwnSelection XTOWNSELECTION

+#ifndef NOXTDISPLAY
+#define XtParent XTPARENT
+#endif
+#define XtParseAcceleratorTable XTPARSEACCELERATORTABLE

 #define XtParseTranslationTable XTPARSETRANSLATIONTABLE
 #define XtPopdown XTPOPDOWN
 #define XtPopup XTPOPUP
 #define XtParseTranslationTable XTPARSETRANSLATIONTABLE
 #define XtPopdown XTPOPDOWN
 #define XtPopup XTPOPUP


@@ -677,6 +773,7 @@
 #define XtRealizeWidget XTREALIZEWIDGET
 #define XtRealloc XTREALLOC
 #define XtRegisterDrawable _XTREGISTERWINDOW
 #define XtRealizeWidget XTREALIZEWIDGET
 #define XtRealloc XTREALLOC
 #define XtRegisterDrawable _XTREGISTERWINDOW

+#define XtRegisterGrabAction XTREGISTERGRABACTION

 #define XtReleaseGC XTRELEASEGC
 #define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS
 #define XtRemoveCallback XTREMOVECALLBACK
 #define XtReleaseGC XTRELEASEGC
 #define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS
 #define XtRemoveCallback XTREMOVECALLBACK


@@ -687,12 +784,21 @@
 #define XtRemoveWorkProc XTREMOVEWORKPROC
 #define XtResizeWidget XTRESIZEWIDGET
 #define XtResolvePathname XTRESOLVEPATHNAME
 #define XtRemoveWorkProc XTREMOVEWORKPROC
 #define XtResizeWidget XTRESIZEWIDGET
 #define XtResolvePathname XTRESOLVEPATHNAME

+#ifndef NOXTDISPLAY
+#define XtScreen XTSCREEN
+#endif
+#define XtScreenDatabase XTSCREENDATABASE
+#define XtScreenOfObject XTSCREENOFOBJECT
+#define XtSessionReturnToken XTSESSIONRETURNTOKEN
+#define XtSetErrorHandler XTSETERRORHANDLER

 #define XtSetKeyboardFocus XTSETKEYBOARDFOCUS
 #define XtSetKeyboardFocus XTSETKEYBOARDFOCUS

+#define XtSetLanguageProc XTSETLANGUAGEPROC

 #define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED
 #define XtSetSensitive XTSETSENSITIVE
 #define XtSetTypeConverter XTSETTYPECONVERTER
 #define XtSetValues XTSETVALUES
 #define XtShellStrings XTSHELLSTRINGS
 #define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED
 #define XtSetSensitive XTSETSENSITIVE
 #define XtSetTypeConverter XTSETTYPECONVERTER
 #define XtSetValues XTSETVALUES
 #define XtShellStrings XTSHELLSTRINGS

+#define XtStringConversionWarning XTSTRINGCONVERSIONWARNING 

 #define XtStrings XTSTRINGS
 #define XtToolkitInitialize XTTOOLKITINITIALIZE
 #define XtTranslateCoords XTTRANSLATECOORDS
 #define XtStrings XTSTRINGS
 #define XtToolkitInitialize XTTOOLKITINITIALIZE
 #define XtTranslateCoords XTTRANSLATECOORDS


@@ -707,22 +813,34 @@
 #define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET
 #define XtVaCreatePopupShell XTVACREATEPOPUPSHELL
 #define XtVaCreateWidget XTVACREATEWIDGET
 #define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET
 #define XtVaCreatePopupShell XTVACREATEPOPUPSHELL
 #define XtVaCreateWidget XTVACREATEWIDGET

+#define XtVaGetApplicationResources XTVAGETAPPLICATIONRESOURCES

 #define XtVaGetValues XTVAGETVALUES
 #define XtVaSetValues XTVASETVALUES
 #define XtWarning XTWARNING
 #define XtVaGetValues XTVAGETVALUES
 #define XtVaSetValues XTVASETVALUES
 #define XtWarning XTWARNING

+#define XtWarningMsg XTWARNINGMSG

 #define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT
 #define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT

+#ifndef NOXTDISPLAY
+#define XtWindow XTWINDOW
+#endif

 #define XtWindowOfObject XTWINDOWOFOBJECT
 #define XtWindowToWidget XTWINDOWTOWIDGET
 #define XtWindowOfObject XTWINDOWOFOBJECT
 #define XtWindowToWidget XTWINDOWTOWIDGET

+#define XwcDrawImageString XWCDRAWIMAGESTRING

 #define XwcDrawString XWCDRAWSTRING
 #define XwcFreeStringList XWCFREESTRINGLIST
 #define XwcTextEscapement XWCTEXTESCAPEMENT
 #define XwcTextExtents XWCTEXTEXTENTS
 #define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY
 #define XwcDrawString XWCDRAWSTRING
 #define XwcFreeStringList XWCFREESTRINGLIST
 #define XwcTextEscapement XWCTEXTESCAPEMENT
 #define XwcTextExtents XWCTEXTEXTENTS
 #define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY

+#define XwcLookupString XWCLOOKUPSTRING

 #define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST
 #define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST

+#define _XAllocTemp _XALLOCTEMP
+#define _XDeqAsyncHandler _XDEQASYNCHANDLER

 #define _XEatData _XEATDATA
 #define _XFlush _XFLUSH
 #define _XEatData _XEATDATA
 #define _XFlush _XFLUSH

+#define _XFreeTemp _XFREETEMP
+#define _XGetAsyncReply _XGETASYNCREPLY 

 #define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS
 #define _XRead _XREAD
 #define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS
 #define _XRead _XREAD

+#define _XReadPad _XREADPAD

 #define _XRegisterFilterByType _XREGISTERFILTERBYTYPE 
 #define _XReply _XREPLY
 #define _XSend _XSEND
 #define _XRegisterFilterByType _XREGISTERFILTERBYTYPE 
 #define _XReply _XREPLY
 #define _XSend _XSEND


@@ -744,6 +862,7 @@
 #define _XmGrabKeyboard _XMGRABKEYBOARD
 #define _XmGrabPointer _XMGRABPOINTER
 #define _XmInheritClass _XMINHERITCLASS
 #define _XmGrabKeyboard _XMGRABKEYBOARD
 #define _XmGrabPointer _XMGRABPOINTER
 #define _XmInheritClass _XMINHERITCLASS

+#define _XmInputForGadget _XMINPUTFORGADGET

 #define _XmInputInGadget _XMINPUTINGADGET
 #define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST
 #define _XmMenuPopDown _XMMENUPOPDOWN
 #define _XmInputInGadget _XMINPUTINGADGET
 #define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST
 #define _XmMenuPopDown _XMMENUPOPDOWN


@@ -766,18 +885,85 @@
 #define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT
 #define _Xm_fastPtr _XM_FASTPTR
 #define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG
 #define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT
 #define _Xm_fastPtr _XM_FASTPTR
 #define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG

+#define _XtCopyFromArg _XTCOPYFROMARG
+#define _XtCountVaList _XTCOUNTVALIST

 #define _XtInherit _XTINHERIT
 #define _XtInheritTranslations _XTINHERITTRANSLATIONS
 #define _XtInherit _XTINHERIT
 #define _XtInheritTranslations _XTINHERITTRANSLATIONS

+#define _XtIsSubclassOf _XTISSUBCLASSOF
+#define _XtVaToArgList _XTVATOARGLIST

 #define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS
 #define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS

+#define cli$dcl_parse CLI$DCL_PARSE
+#define cli$get_value CLI$GET_VALUE
+#define cli$present  CLI$PRESENT
+#define compositeClassRec COMPOSITECLASSREC

 #define compositeWidgetClass COMPOSITEWIDGETCLASS
 #define compositeWidgetClass COMPOSITEWIDGETCLASS

+#define constraintClassRec CONSTRAINTCLASSREC
+#define constraintWidgetClass CONSTRAINTWIDGETCLASS
+#define coreWidgetClass COREWIDGETCLASS
+#define exe$getspi EXE$GETSPI
+#define lbr$close LBR$CLOSE
+#define lbr$get_header LBR$GET_HEADER
+#define lbr$get_index LBR$GET_INDEX
+#define lbr$get_record LBR$GET_RECORD
+#define lbr$ini_control LBR$INI_CONTROL
+#define lbr$lookup_key LBR$LOOKUP_KEY
+#define lbr$open LBR$OPEN
+#define lbr$output_help LBR$OUTPUT_HELP
+#define lib$add_times LIB$ADD_TIMES
+#define lib$addx LIB$ADDX
+#define lib$create_dir LIB$CREATE_DIR
+#define lib$create_vm_zone LIB$CREATE_VM_ZONE
+#define lib$cvt_from_internal_time LIB$CVT_FROM_INTERNAL_TIME
+#define lib$cvt_htb LIB$CVT_HTB
+#define lib$cvt_vectim LIB$CVT_VECTIM
+#define lib$day LIB$DAY
+#define lib$day_of_week LIB$DAY_OF_WEEK
+#define lib$delete_symbol LIB$DELETE_SYMBOL
+#define lib$delete_vm_zone LIB$DELETE_VM_ZONE
+#define lib$disable_ctrl LIB$DISABLE_CTRL

 #define lib$ediv LIB$EDIV
 #define lib$ediv LIB$EDIV

+#define lib$emul LIB$EMUL
+#define lib$enable_ctrl LIB$ENABLE_CTRL
+#define lib$find_vm_zone LIB$FIND_VM_ZONE
+#define lib$format_date_time LIB$FORMAT_DATE_TIME
+#define lib$free_timer LIB$FREE_TIMER
+#define lib$free_vm LIB$FREE_VM
+#define lib$get_ef LIB$GET_EF
+#define lib$get_foreign LIB$GET_FOREIGN
+#define lib$get_input LIB$GET_INPUT
+#define lib$get_users_language LIB$GET_USERS_LANGUAGE
+#define lib$get_vm LIB$GET_VM
+#define lib$get_symbol LIB$GET_SYMBOL
+#define lib$getdvi LIB$GETDVI
+#define lib$init_date_time_context LIB$INIT_DATE_TIME_CONTEXT
+#define lib$init_timer LIB$INIT_TIMER

 #define lib$find_file LIB$FIND_FILE
 #define lib$find_file_end LIB$FIND_FILE_END
 #define lib$find_file LIB$FIND_FILE
 #define lib$find_file_end LIB$FIND_FILE_END

+#define lib$find_image_symbol LIB$FIND_IMAGE_SYMBOL
+#define lib$mult_delta_time LIB$MULT_DELTA_TIME
+#define lib$put_output LIB$PUT_OUTPUT
+#define lib$rename_file LIB$RENAME_FILE
+#define lib$reset_vm_zone LIB$RESET_VM_ZONE

 #define lib$set_symbol LIB$SET_SYMBOL
 #define lib$sfree1_dd LIB$SFREE1_DD
 #define lib$set_symbol LIB$SET_SYMBOL
 #define lib$sfree1_dd LIB$SFREE1_DD

+#define lib$show_vm LIB$SHOW_VM
+#define lib$show_vm_zone LIB$SHOW_VM_ZONE

 #define lib$spawn LIB$SPAWN
 #define lib$spawn LIB$SPAWN

+#define lib$stat_timer LIB$STAT_TIMER

 #define lib$subx LIB$SUBX
 #define lib$subx LIB$SUBX

+#define lib$sub_times LIB$SUB_TIMES

 #define lib$wait LIB$WAIT
 #define lib$wait LIB$WAIT

+#define mail$send_add_address MAIL$SEND_ADD_ADDRESS
+#define mail$send_add_attribute MAIL$SEND_ADD_ATTRIBUTE
+#define mail$send_add_bodypart MAIL$SEND_ADD_BODYPART
+#define mail$send_begin MAIL$SEND_BEGIN
+#define mail$send_end MAIL$SEND_END
+#define mail$send_message MAIL$SEND_MESSAGE
+#define ncs$convert NCS$CONVERT
+#define ncs$get_cf NCS$GET_CF
+#define objectClass OBJECTCLASS
+#define objectClassRec OBJECTCLASSREC
+#define overrideShellClassRec OVERRIDESHELLCLASSREC

 #define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS
 #define pthread_attr_create PTHREAD_ATTR_CREATE
 #define pthread_attr_delete PTHREAD_ATTR_DELETE
 #define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS
 #define pthread_attr_create PTHREAD_ATTR_CREATE
 #define pthread_attr_delete PTHREAD_ATTR_DELETE


@@ -869,29 +1055,101 @@
 #define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
 #define pthread_yield PTHREAD_YIELD
 #define pthread_yield_np PTHREAD_YIELD_NP
 #define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP
 #define pthread_yield PTHREAD_YIELD
 #define pthread_yield_np PTHREAD_YIELD_NP

+#define rectObjClass RECTOBJCLASS
+#define rectObjClassRec RECTOBJCLASSREC
+#define sessionShellWidgetClass SESSIONSHELLWIDGETCLASS

 #define shellWidgetClass SHELLWIDGETCLASS
 #define shmat SHMAT
 #define shmctl SHMCTL
 #define shmdt SHMDT
 #define shmget SHMGET
 #define shellWidgetClass SHELLWIDGETCLASS
 #define shmat SHMAT
 #define shmctl SHMCTL
 #define shmdt SHMDT
 #define shmget SHMGET

+#define smg$create_key_table SMG$CREATE_KEY_TABLE
+#define smg$create_virtual_keyboard SMG$CREATE_VIRTUAL_KEYBOARD
+#define smg$read_composed_line SMG$READ_COMPOSED_LINE
+#define sys$add_ident SYS$ADD_IDENT
+#define sys$asctoid SYS$ASCTOID

 #define sys$assign SYS$ASSIGN
 #define sys$bintim SYS$BINTIM
 #define sys$assign SYS$ASSIGN
 #define sys$bintim SYS$BINTIM

+#define sys$cancel SYS$CANCEL
+#define sys$cantim SYS$CANTIM
+#define sys$check_access SYS$CHECK_ACCESS
+#define sys$close SYS$CLOSE
+#define sys$connect SYS$CONNECT
+#define sys$create SYS$CREATE
+#define sys$create_user_profile SYS$CREATE_USER_PROFILE

 #define sys$crembx SYS$CREMBX
 #define sys$crembx SYS$CREMBX

+#define sys$creprc SYS$CREPRC
+#define sys$crmpsc SYS$CRMPSC

 #define sys$dassgn SYS$DASSGN
 #define sys$dassgn SYS$DASSGN

+#define sys$dclast SYS$DCLAST

 #define sys$dclexh SYS$DCLEXH
 #define sys$dclexh SYS$DCLEXH

+#define sys$delprc SYS$DELPRC
+#define sys$deq SYS$DEQ
+#define sys$dgblsc SYS$DGBLSC
+#define sys$display SYS$DISPLAY
+#define sys$enq SYS$ENQ
+#define sys$enqw SYS$ENQW
+#define sys$erase SYS$ERASE
+#define sys$fao SYS$FAO
+#define sys$faol SYS$FAOL
+#define sys$find_held SYS$FIND_HELD
+#define sys$finish_rdb SYS$FINISH_RDB
+#define sys$flush SYS$FLUSH
+#define sys$forcex SYS$FORCEX
+#define sys$get SYS$GET
+#define sys$get_security SYS$GET_SECURITY

 #define sys$getdviw SYS$GETDVIW
 #define sys$getdviw SYS$GETDVIW

+#define sys$getjpi SYS$GETJPI
+#define sys$getjpiw SYS$GETJPIW
+#define sys$getlkiw SYS$GETLKIW
+#define sys$getmsg SYS$GETMSG
+#define sys$getsyi SYS$GETSYI

 #define sys$getsyiw SYS$GETSYIW
 #define sys$gettim SYS$GETTIM
 #define sys$getsyiw SYS$GETSYIW
 #define sys$gettim SYS$GETTIM

+#define sys$getuai SYS$GETUAI
+#define sys$grantid SYS$GRANTID
+#define sys$hash_password SYS$HASH_PASSWORD
+#define sys$hiber SYS$HIBER
+#define sys$mgblsc SYS$MGBLSC
+#define sys$numtim SYS$NUMTIM
+#define sys$open SYS$OPEN
+#define sys$parse SYS$PARSE
+#define sys$parse_acl SYS$PARSE_ACL
+#define sys$parse_acl SYS$PARSE_ACL
+#define sys$persona_assume SYS$PERSONA_ASSUME
+#define sys$persona_create SYS$PERSONA_CREATE
+#define sys$persona_delete SYS$PERSONA_DELETE
+#define sys$process_scan SYS$PROCESS_SCAN
+#define sys$put SYS$PUT

 #define sys$qio SYS$QIO
 #define sys$qiow SYS$QIOW
 #define sys$qio SYS$QIO
 #define sys$qiow SYS$QIOW

+#define sys$read SYS$READ
+#define sys$resched SYS$RESCHED
+#define sys$rewind SYS$REWIND
+#define sys$search SYS$SEARCH
+#define sys$set_security SYS$SET_SECURITY

 #define sys$setast SYS$SETAST
 #define sys$setef SYS$SETEF
 #define sys$setast SYS$SETAST
 #define sys$setef SYS$SETEF

+#define sys$setimr SYS$SETIMR
+#define sys$setpri SYS$SETPRI
+#define sys$setprn SYS$SETPRN
+#define sys$setprv SYS$SETPRV
+#define sys$setswm SYS$SETSWM
+#define sys$setuai SYS$SETUAI
+#define sys$sndopr SYS$SNDOPR

 #define sys$synch SYS$SYNCH
 #define sys$synch SYS$SYNCH

+#define sys$trnlnm SYS$TRNLNM
+#define sys$update SYS$UPDATE
+#define sys$wake SYS$WAKE
+#define sys$write SYS$WRITE

 #define topLevelShellClassRec TOPLEVELSHELLCLASSREC
 #define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS
 #define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS
 #define vendorShellClassRec VENDORSHELLCLASSREC
 #define vendorShellWidgetClass VENDORSHELLWIDGETCLASS
 #define topLevelShellClassRec TOPLEVELSHELLCLASSREC
 #define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS
 #define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS
 #define vendorShellClassRec VENDORSHELLCLASSREC
 #define vendorShellWidgetClass VENDORSHELLWIDGETCLASS

+#define widgetClass WIDGETCLASS
+#define widgetClassRec WIDGETCLASSREC
+#define wmShellClassRec WMSHELLCLASSREC

 #define wmShellWidgetClass WMSHELLWIDGETCLASS
 #define x$soft_ast_lib_lock X$SOFT_AST_LIB_LOCK
 #define x$soft_ast_lock_depth X$SOFT_AST_LOCK_DEPTH
 #define wmShellWidgetClass WMSHELLWIDGETCLASS
 #define x$soft_ast_lib_lock X$SOFT_AST_LIB_LOCK
 #define x$soft_ast_lock_depth X$SOFT_AST_LOCK_DEPTH


@@ -901,6 +1159,7 @@
 #define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC
 #define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS
 #define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS
 #define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC
 #define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS
 #define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS

+#define xmCommandWidgetClass XMCOMMANDWIDGETCLASS

 #define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS
 #define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS
 #define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS
 #define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS
 #define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS
 #define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS


@@ -934,12 +1193,14 @@
 #define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
 #define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
 
 #define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS
 #define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS
 

-#define SetReqLen(req,n,badlen) \
+#if (__VMS_VER < 80200000) 
+# define SetReqLen(req,n,badlen) \

     if ((req->length + n) > (unsigned)65535) { \
            n = badlen; \
            req->length += n; \
     } else \
        req->length += n
     if ((req->length + n) > (unsigned)65535) { \
            n = badlen; \
            req->length += n; \
     } else \
        req->length += n

+#endif

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {