nx-X11/lib/X11 · ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09 · dimbor / nx-libs

avoid conflicts when mixing own includes with upstream includes · 232c7ad9
Ulrich Sibiller authored Jul 01, 2016
```
We might better change all guard defines with the ones upstream is
using but for now this should also work.
```
232c7ad9

Name	Last commit	Last update
..
lcUniConv		Loading commit data...
util		Loading commit data...
xlibi18n		Loading commit data...
AddDIC.c		Loading commit data...
AddSF.c		Loading commit data...
AllCells.c		Loading commit data...
AllPlanes.c		Loading commit data...
AllowEv.c		Loading commit data...
AuDispose.c		Loading commit data...
AuFileName.c		Loading commit data...
AuGetBest.c		Loading commit data...
AuRead.c		Loading commit data...
AutoRep.c		Loading commit data...
Backgnd.c		Loading commit data...
BdrWidth.c		Loading commit data...
Bell.c		Loading commit data...
Border.c		Loading commit data...
CCC.c		Loading commit data...
ChAccCon.c		Loading commit data...
ChActPGb.c		Loading commit data...
ChClMode.c		Loading commit data...
ChCmap.c		Loading commit data...
ChGC.c		Loading commit data...
ChKeyCon.c		Loading commit data...
ChPntCon.c		Loading commit data...
ChProp.c		Loading commit data...
ChSaveSet.c		Loading commit data...
ChWAttrs.c		Loading commit data...
ChWindow.c		Loading commit data...
ChkIfEv.c		Loading commit data...
ChkMaskEv.c		Loading commit data...
ChkTypEv.c		Loading commit data...
ChkTypWEv.c		Loading commit data...
ChkWinEv.c		Loading commit data...
CirWin.c		Loading commit data...
CirWinDn.c		Loading commit data...
CirWinUp.c		Loading commit data...
ClDisplay.c		Loading commit data...
Clear.c		Loading commit data...
ClearArea.c		Loading commit data...
Cmap.h		Loading commit data...
ConfWind.c		Loading commit data...
ConnDis.c		Loading commit data...
Context.c		Loading commit data...
ConvSel.c		Loading commit data...
CopyArea.c		Loading commit data...
CopyCmap.c		Loading commit data...
CopyGC.c		Loading commit data...
CopyPlane.c		Loading commit data...
Cr.h		Loading commit data...
CrBFData.c		Loading commit data...
CrCmap.c		Loading commit data...
CrCursor.c		Loading commit data...
CrGC.c		Loading commit data...
CrGlCur.c		Loading commit data...
CrPFBData.c		Loading commit data...
CrPixmap.c		Loading commit data...
CrWindow.c		Loading commit data...
Cursor.c		Loading commit data...
Cv.h		Loading commit data...
CvColW.c		Loading commit data...
CvCols.c		Loading commit data...
DefCursor.c		Loading commit data...
DelProp.c		Loading commit data...
Depths.c		Loading commit data...
DestSubs.c		Loading commit data...
DestWind.c		Loading commit data...
DisName.c		Loading commit data...
DrArc.c		Loading commit data...
DrArcs.c		Loading commit data...
DrLine.c		Loading commit data...
DrLines.c		Loading commit data...
DrPoint.c		Loading commit data...
DrPoints.c		Loading commit data...
DrRect.c		Loading commit data...
DrRects.c		Loading commit data...
DrSegs.c		Loading commit data...
ErrDes.c		Loading commit data...
ErrHndlr.c		Loading commit data...
EvToWire.c		Loading commit data...
FSSaver.c		Loading commit data...
FSWrap.c		Loading commit data...
FetchName.c		Loading commit data...
FillArc.c		Loading commit data...
FillArcs.c		Loading commit data...
FillPoly.c		Loading commit data...
FillRct.c		Loading commit data...
FillRcts.c		Loading commit data...
FilterEv.c		Loading commit data...
Flush.c		Loading commit data...
Font.c		Loading commit data...
FontInfo.c		Loading commit data...
FontNames.c		Loading commit data...
FreeCmap.c		Loading commit data...
FreeCols.c		Loading commit data...
FreeCurs.c		Loading commit data...
FreeEData.c		Loading commit data...
FreeGC.c		Loading commit data...
FreePix.c		Loading commit data...
GCMisc.c		Loading commit data...
Geom.c		Loading commit data...
GetAtomNm.c		Loading commit data...
GetColor.c		Loading commit data...
GetDflt.c		Loading commit data...
GetFPath.c		Loading commit data...
GetFProp.c		Loading commit data...
GetGCVals.c		Loading commit data...
GetGeom.c		Loading commit data...
GetHColor.c		Loading commit data...
GetHints.c		Loading commit data...
GetIFocus.c		Loading commit data...
GetImage.c		Loading commit data...
GetKCnt.c		Loading commit data...
GetMoEv.c		Loading commit data...
GetNrmHint.c		Loading commit data...
GetPCnt.c		Loading commit data...
GetPntMap.c		Loading commit data...
GetProp.c		Loading commit data...
GetRGBCMap.c		Loading commit data...
GetSOwner.c		Loading commit data...
GetSSaver.c		Loading commit data...
GetStCmap.c		Loading commit data...
GetTxtProp.c		Loading commit data...
GetWAttrs.c		Loading commit data...
GetWMCMapW.c		Loading commit data...
GetWMProto.c		Loading commit data...
GrButton.c		Loading commit data...
GrKey.c		Loading commit data...
GrKeybd.c		Loading commit data...
GrPointer.c		Loading commit data...
GrServer.c		Loading commit data...
HVC.c		Loading commit data...
HVCGcC.c		Loading commit data...
HVCGcV.c		Loading commit data...
HVCGcVC.c		Loading commit data...
HVCMnV.c		Loading commit data...
HVCMxC.c		Loading commit data...
HVCMxV.c		Loading commit data...
HVCMxVC.c		Loading commit data...
HVCMxVs.c		Loading commit data...
HVCWpAj.c		Loading commit data...
Host.c		Loading commit data...
ICWrap.c		Loading commit data...
IMWrap.c		Loading commit data...
Iconify.c		Loading commit data...
IdOfPr.c		Loading commit data...
IfEvent.c		Loading commit data...
ImText.c		Loading commit data...
ImText16.c		Loading commit data...
ImUtil.c		Loading commit data...
ImUtil.h		Loading commit data...
Imakefile		Loading commit data...
InitExt.c		Loading commit data...
InsCmap.c		Loading commit data...
IntAtom.c		Loading commit data...
Key.h		Loading commit data...
KeyBind.c		Loading commit data...
KeysymStr.c		Loading commit data...
KillCl.c		Loading commit data...
LRGB.c		Loading commit data...
Lab.c		Loading commit data...
LabGcC.c		Loading commit data...
LabGcL.c		Loading commit data...
LabGcLC.c		Loading commit data...
LabMnL.c		Loading commit data...
LabMxC.c		Loading commit data...
LabMxL.c		Loading commit data...
LabMxLC.c		Loading commit data...
LabWpAj.c		Loading commit data...
LiHosts.c		Loading commit data...
LiICmaps.c		Loading commit data...
LiProps.c		Loading commit data...
ListExt.c		Loading commit data...
LoadFont.c		Loading commit data...
LockDis.c		Loading commit data...
LookupCol.c		Loading commit data...
LowerWin.c		Loading commit data...
Luv.c		Loading commit data...
LuvGcC.c		Loading commit data...
LuvGcL.c		Loading commit data...
LuvGcLC.c		Loading commit data...
LuvMnL.c		Loading commit data...
LuvMxC.c		Loading commit data...
LuvMxL.c		Loading commit data...
LuvMxLC.c		Loading commit data...
LuvWpAj.c		Loading commit data...
Macros.c		Loading commit data...
MapRaised.c		Loading commit data...
MapSubs.c		Loading commit data...
MapWindow.c		Loading commit data...
MaskEvent.c		Loading commit data...
Misc.c		Loading commit data...
ModMap.c		Loading commit data...
MoveWin.c		Loading commit data...
NextEvent.c		Loading commit data...
OCWrap.c		Loading commit data...
OMWrap.c		Loading commit data...
OfCCC.c		Loading commit data...
OpenDis.c		Loading commit data...
ParseCmd.c		Loading commit data...
ParseCol.c		Loading commit data...
ParseGeom.c		Loading commit data...
PeekEvent.c		Loading commit data...
PeekIfEv.c		Loading commit data...
Pending.c		Loading commit data...
PixFormats.c		Loading commit data...
PmapBgnd.c		Loading commit data...
PmapBord.c		Loading commit data...
PolyReg.c		Loading commit data...
PolyTxt.c		Loading commit data...
PolyTxt16.c		Loading commit data...
PrOfId.c		Loading commit data...
PropAlloc.c		Loading commit data...
PutBEvent.c		Loading commit data...
PutImage.c		Loading commit data...
QBlack.c		Loading commit data...
QBlue.c		Loading commit data...
QGreen.c		Loading commit data...
QRed.c		Loading commit data...
QWhite.c		Loading commit data...
QuBest.c		Loading commit data...
QuCol.c		Loading commit data...
QuColor.c		Loading commit data...
QuColors.c		Loading commit data...
QuCols.c		Loading commit data...
QuCurShp.c		Loading commit data...
QuExt.c		Loading commit data...
QuKeybd.c		Loading commit data...
QuPntr.c		Loading commit data...
QuStipShp.c		Loading commit data...
QuTextE16.c		Loading commit data...
QuTextExt.c		Loading commit data...
QuTileShp.c		Loading commit data...
QuTree.c		Loading commit data...
Quarks.c		Loading commit data...
RaiseWin.c		Loading commit data...
RdBitF.c		Loading commit data...
RecolorC.c		Loading commit data...
ReconfWM.c		Loading commit data...
ReconfWin.c		Loading commit data...
Region.c		Loading commit data...
RegstFlt.c		Loading commit data...
RepWindow.c		Loading commit data...
RestackWs.c		Loading commit data...
RotProp.c		Loading commit data...
ScrResStr.c		Loading commit data...
SelInput.c		Loading commit data...
SendEvent.c		Loading commit data...
SetBack.c		Loading commit data...
SetCCC.c		Loading commit data...
SetCRects.c		Loading commit data...
SetClMask.c		Loading commit data...
SetClOrig.c		Loading commit data...
SetDashes.c		Loading commit data...
SetFPath.c		Loading commit data...
SetFont.c		Loading commit data...
SetFore.c		Loading commit data...
SetFunc.c		Loading commit data...
SetGetCols.c		Loading commit data...
SetHints.c		Loading commit data...
SetIFocus.c		Loading commit data...
SetLStyle.c		Loading commit data...
SetLocale.c		Loading commit data...
SetNrmHint.c		Loading commit data...
SetPMask.c		Loading commit data...
SetPntMap.c		Loading commit data...
SetRGBCMap.c		Loading commit data...
SetSOwner.c		Loading commit data...
SetSSaver.c		Loading commit data...
SetStCmap.c		Loading commit data...
SetState.c		Loading commit data...
SetStip.c		Loading commit data...
SetTSOrig.c		Loading commit data...
SetTile.c		Loading commit data...
SetTxtProp.c		Loading commit data...
SetWMCMapW.c		Loading commit data...
SetWMProto.c		Loading commit data...
StBytes.c		Loading commit data...
StCol.c		Loading commit data...
StColor.c		Loading commit data...
StColors.c		Loading commit data...
StCols.c		Loading commit data...
StNColor.c		Loading commit data...
StName.c		Loading commit data...
StrKeysym.c		Loading commit data...
StrToText.c		Loading commit data...
Sync.c		Loading commit data...
Synchro.c		Loading commit data...
Text.c		Loading commit data...
Text16.c		Loading commit data...
TextExt.c		Loading commit data...
TextExt16.c		Loading commit data...
TextToStr.c		Loading commit data...
TrCoords.c		Loading commit data...
UIThrStubs.c		Loading commit data...
UNDEFINED.c		Loading commit data...
UndefCurs.c		Loading commit data...
UngrabBut.c		Loading commit data...
UngrabKbd.c		Loading commit data...
UngrabKey.c		Loading commit data...
UngrabPtr.c		Loading commit data...
UngrabSvr.c		Loading commit data...
UninsCmap.c		Loading commit data...
UnldFont.c		Loading commit data...
UnmapSubs.c		Loading commit data...
UnmapWin.c		Loading commit data...
VisUtil.c		Loading commit data...
WMGeom.c		Loading commit data...
WMProps.c		Loading commit data...
WarpPtr.c		Loading commit data...
WinEvent.c		Loading commit data...
Window.c		Loading commit data...
Withdraw.c		Loading commit data...
WrBitF.c		Loading commit data...
X11-def.cpp		Loading commit data...
XDefaultIMIF.c		Loading commit data...
XDefaultOMIF.c		Loading commit data...
XErrorDB		Loading commit data...
XKB.c		Loading commit data...
XKBAlloc.c		Loading commit data...
XKBBell.c		Loading commit data...
XKBBind.c		Loading commit data...
XKBCompat.c		Loading commit data...
XKBCtrls.c		Loading commit data...
XKBCvt.c		Loading commit data...
XKBExtDev.c		Loading commit data...
XKBGAlloc.c		Loading commit data...
XKBGeom.c		Loading commit data...
XKBGetByName.c		Loading commit data...
XKBGetMap.c		Loading commit data...
XKBList.c		Loading commit data...
XKBMAlloc.c		Loading commit data...
XKBMisc.c		Loading commit data...
XKBNames.c		Loading commit data...
XKBRdBuf.c		Loading commit data...
XKBSetGeom.c		Loading commit data...
XKBSetMap.c		Loading commit data...
XKBUse.c		Loading commit data...
XKBleds.c		Loading commit data...
XKBlib.h		Loading commit data...
XKBlibint.h		Loading commit data...
XKeysymDB		Loading commit data...
XRGB.c		Loading commit data...
XYZ.c		Loading commit data...
Xaixlcint.h		Loading commit data...
Xatomtype.h		Loading commit data...
Xcms.h		Loading commit data...
Xcms.txt		Loading commit data...
Xcmsint.h		Loading commit data...
XimImSw.h		Loading commit data...
XimProto.h		Loading commit data...
XimThai.h		Loading commit data...
XimTrInt.h		Loading commit data...
XimTrX.h		Loading commit data...
XimTrans.h		Loading commit data...
Ximint.h		Loading commit data...
XimintL.h		Loading commit data...
XimintP.h		Loading commit data...
Xintatom.h		Loading commit data...
Xintconn.h		Loading commit data...
XlcDL.c		Loading commit data...
XlcGeneric.h		Loading commit data...
XlcPubI.h		Loading commit data...
XlcPublic.h		Loading commit data...
XlcSL.c		Loading commit data...
Xlcint.h		Loading commit data...
Xlib.h		Loading commit data...
XlibAsync.c		Loading commit data...
XlibConf.h		Loading commit data...
XlibInt.c		Loading commit data...
Xlibint.h		Loading commit data...
Xlocale.h		Loading commit data...
XomGeneric.h		Loading commit data...
Xregion.h		Loading commit data...
Xresinternal.h		Loading commit data...
Xresource.h		Loading commit data...
Xrm.c		Loading commit data...
XrmI.h		Loading commit data...
Xutil.h		Loading commit data...
cmsAllCol.c		Loading commit data...
cmsAllNCol.c		Loading commit data...
cmsCmap.c		Loading commit data...
cmsColNm.c		Loading commit data...
cmsGlobls.c		Loading commit data...
cmsInt.c		Loading commit data...
cmsLkCol.c		Loading commit data...
cmsMath.c		Loading commit data...
cmsProp.c		Loading commit data...
cmsTrig.c		Loading commit data...
cursorfont.h		Loading commit data...
evtomask.c		Loading commit data...
globals.c		Loading commit data...
imCallbk.c		Loading commit data...
imConv.c		Loading commit data...
imDefFlt.c		Loading commit data...
imDefIc.c		Loading commit data...
imDefIm.c		Loading commit data...
imDefLkup.c		Loading commit data...
imDispch.c		Loading commit data...
imEvToWire.c		Loading commit data...
imExten.c		Loading commit data...
imImSw.c		Loading commit data...
imInsClbk.c		Loading commit data...
imInt.c		Loading commit data...
imKStoUCS.c		Loading commit data...
imLcFlt.c		Loading commit data...
imLcGIc.c		Loading commit data...
imLcIc.c		Loading commit data...
imLcIm.c		Loading commit data...
imLcLkup.c		Loading commit data...
imLcPrs.c		Loading commit data...
imLcSIc.c		Loading commit data...
imRm.c		Loading commit data...
imRmAttr.c		Loading commit data...
imThaiFlt.c		Loading commit data...
imThaiIc.c		Loading commit data...
imThaiIm.c		Loading commit data...
imTrX.c		Loading commit data...
imTrans.c		Loading commit data...
imTransR.c		Loading commit data...
jump_funcs		Loading commit data...
jump_ignore		Loading commit data...
jump_vars		Loading commit data...
lcCT.c		Loading commit data...
lcCharSet.c		Loading commit data...
lcConv.c		Loading commit data...
lcDB.c		Loading commit data...
lcDefConv.c		Loading commit data...
lcDynamic.c		Loading commit data...
lcEuc.c		Loading commit data...
lcFile.c		Loading commit data...
lcGenConv.c		Loading commit data...
lcGeneric.c		Loading commit data...
lcInit.c		Loading commit data...
lcJis.c		Loading commit data...
lcPrTxt.c		Loading commit data...
lcPubWrap.c		Loading commit data...
lcPublic.c		Loading commit data...
lcRM.c		Loading commit data...
lcSjis.c		Loading commit data...
lcStd.c		Loading commit data...
lcTxtPr.c		Loading commit data...
lcUTF8.c		Loading commit data...
lcUTF8Load.c		Loading commit data...
lcUtil.c		Loading commit data...
lcWrap.c		Loading commit data...
libX11.elist		Loading commit data...
locking.c		Loading commit data...
locking.h		Loading commit data...
mbWMProps.c		Loading commit data...
mbWrap.c		Loading commit data...
omDefault.c		Loading commit data...
omGeneric.c		Loading commit data...
omImText.c		Loading commit data...
omText.c		Loading commit data...
omTextEsc.c		Loading commit data...
omTextExt.c		Loading commit data...
omTextPer.c		Loading commit data...
omXChar.c		Loading commit data...
os2Stubs.c		Loading commit data...
poly.h		Loading commit data...
udcInf.c		Loading commit data...
utf8WMProps.c		Loading commit data...
utf8Wrap.c		Loading commit data...
uvY.c		Loading commit data...
wcWrap.c		Loading commit data...
xyY.c		Loading commit data...