libX11 mesa git update 9 Feb 2011

3 files changed, 433 insertions, 479 deletions

diff --git a/libX11/src/Makefile.am b/libX11/src/Makefile.am
index 455650c58..71e02e71b 100644
--- a/libX11/src/Makefile.am
+++ b/libX11/src/Makefile.am
@@ -1,426 +1,425 @@
-if XKB

-XKB_SUBDIRS = xkb

-endif

-SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)

-

-lib_LTLIBRARIES = libX11.la libX11-xcb.la

-

-BUILT_SOURCES=ks_tables.h

-CLEANFILES=ks_tables.h ks_tables_h

-

-AM_CPPFLAGS= \

-	-I$(top_srcdir)/include \

-	-I$(top_srcdir)/include/X11 \

-	-I$(top_builddir)/include \

-	-I$(top_builddir)/include/X11 \

-	-I$(top_srcdir)/src/xcms \

-	-I$(top_srcdir)/src/xkb \

-	-I$(top_srcdir)/src/xlibi18n \

-	-D_BSD_SOURCE -DX11_t -DTRANS_CLIENT

-

-AM_CFLAGS= \

-	$(X11_CFLAGS) \

-	$(BIGFONT_CFLAGS) \

-	$(XMALLOC_ZERO_CFLAGS) \

-	$(CWARNFLAGS)

-

-#

-# =============================== I18N =============================

-#

-

-I18N_LIBS = \

-	xlibi18n/libi18n.la

-

-#

-# =============================== XCMS =============================

-#

-

-XCMS_LIBS = \

-	xcms/libxcms.la

-

-#

-# =============================== XKB ==============================

-#

-

-XKB_LIBS = \

-	xkb/libxkb.la

-

-#

-# =============================== XLIB =============================

-#

-

-libX11_la_SOURCES = \

-                  AllCells.c \

-                  AllowEv.c \

-                  AllPlanes.c \

-                  AutoRep.c \

-                  Backgnd.c \

-                  BdrWidth.c \

-                  Bell.c \

-                  Border.c \

-                  ChAccCon.c \

-                  ChActPGb.c \

-                  ChClMode.c \

-                  ChCmap.c \

-                  ChGC.c \

-                  ChKeyCon.c \

-                  ChkIfEv.c \

-                  ChkMaskEv.c \

-                  ChkTypEv.c \

-                  ChkTypWEv.c \

-                  ChkWinEv.c \

-                  ChPntCon.c \

-                  ChProp.c \

-                  ChSaveSet.c \

-                  ChWAttrs.c \

-                  ChWindow.c \

-                  CirWin.c \

-                  CirWinDn.c \

-                  CirWinUp.c \

-                  ClDisplay.c \

-                  ClearArea.c \

-                  Clear.c \

-		  Cmap.h \

-                  ConfWind.c \

-                  Context.c \

-                  ConvSel.c \

-                  CopyArea.c \

-                  CopyCmap.c \

-                  CopyGC.c \

-                  CopyPlane.c \

-                  CrBFData.c \

-                  CrCmap.c \

-                  CrCursor.c \

-                  CrGC.c \

-                  CrGlCur.c \

-                  Cr.h \

-                  CrPFBData.c \

-                  CrPixmap.c \

-                  CrWindow.c \

-                  Cursor.c \

-                  DefCursor.c \

-                  DelProp.c \

-                  Depths.c \

-                  DestSubs.c \

-                  DestWind.c \

-                  DisName.c \

-                  DrArc.c \

-                  DrArcs.c \

-                  DrLine.c \

-                  DrLines.c \

-                  DrPoint.c \

-                  DrPoints.c \

-                  DrRect.c \

-                  DrRects.c \

-                  DrSegs.c \

-                  ErrDes.c \

-                  ErrHndlr.c \

-                  evtomask.c \

-                  EvToWire.c \

-                  FetchName.c \

-                  FillArc.c \

-                  FillArcs.c \

-                  FillPoly.c \

-                  FillRct.c \

-                  FillRcts.c \

-                  FilterEv.c \

-                  Flush.c \

-                  Font.c \

-                  FontInfo.c \

-                  FontNames.c \

-                  FreeCmap.c \

-                  FreeCols.c \

-                  FreeCurs.c \

-                  FreeEData.c \

-                  FreeEventData.c \

-                  FreeGC.c \

-                  FreePix.c \

-                  FSSaver.c \

-                  FSWrap.c \

-                  GCMisc.c \

-                  Geom.c \

-                  GetAtomNm.c \

-                  GetColor.c \

-                  GetDflt.c \

-                  GetEventData.c \

-                  GetFPath.c \

-                  GetFProp.c \

-                  GetGCVals.c \

-                  GetGeom.c \

-                  GetHColor.c \

-                  GetHints.c \

-                  GetIFocus.c \

-                  GetImage.c \

-                  GetKCnt.c \

-                  GetMoEv.c \

-                  GetNrmHint.c \

-                  GetPCnt.c \

-                  GetPntMap.c \

-                  GetProp.c \

-                  GetRGBCMap.c \

-                  GetSOwner.c \

-                  GetSSaver.c \

-                  GetStCmap.c \

-                  GetTxtProp.c \

-                  GetWAttrs.c \

-                  GetWMCMapW.c \

-                  GetWMProto.c \

-                  globals.c \

-                  GrButton.c \

-                  GrKeybd.c \

-                  GrKey.c \

-                  GrPointer.c \

-                  GrServer.c \

-                  Host.c \

-                  Iconify.c \

-                  IfEvent.c \

-		  imConv.c \

-                  ImText16.c \

-                  ImText.c \

-                  ImUtil.c \

-                  InitExt.c \

-                  InsCmap.c \

-                  IntAtom.c \

-                  KeyBind.c \

-                  Key.h \

-                  KeysymStr.c \

-                  KillCl.c \

-                  LiHosts.c \

-                  LiICmaps.c \

-                  LiProps.c \

-                  ListExt.c \

-                  LoadFont.c \

-                  LockDis.c \

-                  locking.c \

-                  locking.h \

-                  LookupCol.c \

-                  LowerWin.c \

-                  Macros.c \

-                  MapRaised.c \

-                  MapSubs.c \

-                  MapWindow.c \

-                  MaskEvent.c \

-                  Misc.c \

-                  ModMap.c \

-                  MoveWin.c \

-                  NextEvent.c \

-                  OCWrap.c \

-                  OMWrap.c \

-                  OpenDis.c \

-                  ParseCmd.c \

-                  ParseCol.c \

-                  ParseGeom.c \

-                  PeekEvent.c \

-                  PeekIfEv.c \

-                  Pending.c \

-                  PixFormats.c \

-                  PmapBgnd.c \

-                  PmapBord.c \

-                  poly.h \

-                  PolyReg.c \

-                  PolyTxt16.c \

-                  PolyTxt.c \

-                  PropAlloc.c \

-                  PutBEvent.c \

-                  PutImage.c \

-                  Quarks.c \

-                  QuBest.c \

-                  QuColor.c \

-                  QuColors.c \

-                  QuCurShp.c \

-                  QuExt.c \

-                  QuKeybd.c \

-                  QuPntr.c \

-                  QuStipShp.c \

-                  QuTextE16.c \

-                  QuTextExt.c \

-                  QuTileShp.c \

-                  QuTree.c \

-                  RaiseWin.c \

-                  RdBitF.c \

-                  RecolorC.c \

-                  ReconfWin.c \

-                  ReconfWM.c \

-                  Region.c \

-                  RegstFlt.c \

-                  RepWindow.c \

-                  RestackWs.c \

-                  RotProp.c \

-                  ScrResStr.c \

-                  SelInput.c \

-                  SendEvent.c \

-                  SetBack.c \

-                  SetClMask.c \

-                  SetClOrig.c \

-                  SetCRects.c \

-                  SetDashes.c \

-                  SetFont.c \

-                  SetFore.c \

-                  SetFPath.c \

-                  SetFunc.c \

-                  SetHints.c \

-                  SetIFocus.c \

-                  SetLocale.c \

-                  SetLStyle.c \

-                  SetNrmHint.c \

-                  SetPMask.c \

-                  SetPntMap.c \

-                  SetRGBCMap.c \

-                  SetSOwner.c \

-                  SetSSaver.c \

-                  SetState.c \

-                  SetStCmap.c \

-                  SetStip.c \

-                  SetTile.c \

-                  SetTSOrig.c \

-                  SetTxtProp.c \

-                  SetWMCMapW.c \

-                  SetWMProto.c \

-                  StBytes.c \

-                  StColor.c \

-                  StColors.c \

-                  StName.c \

-                  StNColor.c \

-                  StrKeysym.c \

-                  StrToText.c \

-                  Sync.c \

-                  Synchro.c \

-                  Text16.c \

-                  Text.c \

-                  TextExt16.c \

-                  TextExt.c \

-                  TextToStr.c \

-                  TrCoords.c \

-                  UndefCurs.c \

-                  UngrabBut.c \

-                  UngrabKbd.c \

-                  UngrabKey.c \

-                  UngrabPtr.c \

-                  UngrabSvr.c \

-                  UninsCmap.c \

-                  UnldFont.c \

-                  UnmapSubs.c \

-                  UnmapWin.c \

-                  utlist.h \

-                  VisUtil.c \

-                  WarpPtr.c \

-                  Window.c \

-                  WinEvent.c \

-                  Withdraw.c \

-                  WMGeom.c \

-                  WMProps.c \

-                  WrBitF.c \

-                  Xatomtype.h \

-                  xcb_disp.c \

-                  xcb_io.c \

-                  Xintatom.h \

-                  Xintconn.h \

-                  XlibAsync.c \

-                  XlibInt.c \

-                  Xprivate.h \

-                  XomGeneric.h \

-                  Xresinternal.h \

-                  Xrm.c \

-                  XrmI.h \

-                  Xxcbint.h

-

-#

-# ========================= Extra stuff ============================

-#

-

-if OS2

-libX11_la_SOURCES+=os2Stubs.c

-endif OS2

-

-if UDC

-libX11_la_SOURCES+=udcInf.c

-endif

-

-if THRSTUBS

-libX11_la_SOURCES+=UIThrStubs.c

-endif

-

-x11datadir = @X11_DATADIR@

-x11data_DATA = XErrorDB

-

-EXTRA_DIST = \

-	$(x11data_DATA) \

-	os2Stubs.c \

-	udcInf.c \

-	UIThrStubs.c 

-

-libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h

-libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined

-libX11_xcb_la_LIBADD = libX11.la

-

-#

-# Figure out which sub-libraries to link into Xlib

-#

-

-if XLOCALE

-USE_I18N_LIBS = $(I18N_LIBS)

-endif

-

-if XCMS

-USE_XCMS_LIBS = $(XCMS_LIBS)

-endif

-

-if XKB

-USE_XKB_LIBS = $(XKB_LIBS)

-endif

-

-libX11_la_LDFLAGS = -version-number 6:3:0 -no-undefined

-

-libX11_la_LIBADD = \

-	$(USE_I18N_LIBS) \

-	$(USE_XCMS_LIBS) \

-	$(USE_XKB_LIBS) \

-	$(X11_LIBS)

-

-preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))

-.c.ii:

-	$(COMPILE) -E -o $@ `test -f '$<' || echo '$(srcdir)/'`$<

-

-if LINT

-# Check source code with tools like lint & sparse

-

-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

-		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)

-

-lint:	$(BUILT_SOURCES)

-	for f in $(libX11_la_SOURCES) ; do \

-		$(LINT) $(ALL_LINT_FLAGS) $$f ; \

-	done

-	@for subdir in $(SUBDIRS) ; do \

-		echo "Making $@ in src/$$subdir"; \

-		(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \

-	done

-endif LINT

-

-if MAKE_LINT_LIB

-lintlibdir = $(libdir)

-

-lintlib_DATA = $(LINTLIB)

-

-lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c

-

-CLEANFILES += $(lintlib_DATA)

-

-$(LINTLIB): $(libX11_la_SOURCES)

-	$(AM_V_GEN)$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)

-endif MAKE_LINT_LIB

-

-#

-# Building ks_tables.h requires the makekeys utility

-#

-

-KEYSYMDEFS=@KEYSYMDEFS@

-

-ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)

-	$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h

-	mv ks_tables_h $@

-

-$(top_builddir)/src/util/makekeys$(EXEEXT): force

-	cd util && $(MAKE)

-

-force:

+if XKB
+XKB_SUBDIRS = xkb
+endif
+SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
+
+lib_LTLIBRARIES = libX11.la libX11-xcb.la
+
+BUILT_SOURCES=ks_tables.h
+CLEANFILES=ks_tables.h ks_tables_h
+
+AM_CPPFLAGS= \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/include/X11 \
+	-I$(top_builddir)/include \
+	-I$(top_builddir)/include/X11 \
+	-I$(top_srcdir)/src/xcms \
+	-I$(top_srcdir)/src/xkb \
+	-I$(top_srcdir)/src/xlibi18n \
+	-D_BSD_SOURCE -DX11_t -DTRANS_CLIENT
+
+AM_CFLAGS= \
+	$(X11_CFLAGS) \
+	$(BIGFONT_CFLAGS) \
+	$(XMALLOC_ZERO_CFLAGS) \
+	$(CWARNFLAGS)
+
+#
+# =============================== I18N =============================
+#
+
+I18N_LIBS = \
+	xlibi18n/libi18n.la
+
+#
+# =============================== XCMS =============================
+#
+
+XCMS_LIBS = \
+	xcms/libxcms.la
+
+#
+# =============================== XKB ==============================
+#
+
+XKB_LIBS = \
+	xkb/libxkb.la
+
+#
+# =============================== XLIB =============================
+#
+
+libX11_la_SOURCES = \
+                  AllCells.c \
+                  AllowEv.c \
+                  AllPlanes.c \
+                  AutoRep.c \
+                  Backgnd.c \
+                  BdrWidth.c \
+                  Bell.c \
+                  Border.c \
+                  ChAccCon.c \
+                  ChActPGb.c \
+                  ChClMode.c \
+                  ChCmap.c \
+                  ChGC.c \
+                  ChKeyCon.c \
+                  ChkIfEv.c \
+                  ChkMaskEv.c \
+                  ChkTypEv.c \
+                  ChkTypWEv.c \
+                  ChkWinEv.c \
+                  ChPntCon.c \
+                  ChProp.c \
+                  ChSaveSet.c \
+                  ChWAttrs.c \
+                  ChWindow.c \
+                  CirWin.c \
+                  CirWinDn.c \
+                  CirWinUp.c \
+                  ClDisplay.c \
+                  ClearArea.c \
+                  Clear.c \
+		  Cmap.h \
+                  ConfWind.c \
+                  Context.c \
+                  ConvSel.c \
+                  CopyArea.c \
+                  CopyCmap.c \
+                  CopyGC.c \
+                  CopyPlane.c \
+                  CrBFData.c \
+                  CrCmap.c \
+                  CrCursor.c \
+                  CrGC.c \
+                  CrGlCur.c \
+                  Cr.h \
+                  CrPFBData.c \
+                  CrPixmap.c \
+                  CrWindow.c \
+                  Cursor.c \
+                  DefCursor.c \
+                  DelProp.c \
+                  Depths.c \
+                  DestSubs.c \
+                  DestWind.c \
+                  DisName.c \
+                  DrArc.c \
+                  DrArcs.c \
+                  DrLine.c \
+                  DrLines.c \
+                  DrPoint.c \
+                  DrPoints.c \
+                  DrRect.c \
+                  DrRects.c \
+                  DrSegs.c \
+                  ErrDes.c \
+                  ErrHndlr.c \
+                  evtomask.c \
+                  EvToWire.c \
+                  FetchName.c \
+                  FillArc.c \
+                  FillArcs.c \
+                  FillPoly.c \
+                  FillRct.c \
+                  FillRcts.c \
+                  FilterEv.c \
+                  Flush.c \
+                  Font.c \
+                  FontInfo.c \
+                  FontNames.c \
+                  FreeCmap.c \
+                  FreeCols.c \
+                  FreeCurs.c \
+                  FreeEData.c \
+                  FreeEventData.c \
+                  FreeGC.c \
+                  FreePix.c \
+                  FSSaver.c \
+                  FSWrap.c \
+                  GCMisc.c \
+                  Geom.c \
+                  GetAtomNm.c \
+                  GetColor.c \
+                  GetDflt.c \
+                  GetEventData.c \
+                  GetFPath.c \
+                  GetFProp.c \
+                  GetGCVals.c \
+                  GetGeom.c \
+                  GetHColor.c \
+                  GetHints.c \
+                  GetIFocus.c \
+                  GetImage.c \
+                  GetKCnt.c \
+                  GetMoEv.c \
+                  GetNrmHint.c \
+                  GetPCnt.c \
+                  GetPntMap.c \
+                  GetProp.c \
+                  GetRGBCMap.c \
+                  GetSOwner.c \
+                  GetSSaver.c \
+                  GetStCmap.c \
+                  GetTxtProp.c \
+                  GetWAttrs.c \
+                  GetWMCMapW.c \
+                  GetWMProto.c \
+                  globals.c \
+                  GrButton.c \
+                  GrKeybd.c \
+                  GrKey.c \
+                  GrPointer.c \
+                  GrServer.c \
+                  Host.c \
+                  Iconify.c \
+                  IfEvent.c \
+		  imConv.c \
+                  ImText16.c \
+                  ImText.c \
+                  ImUtil.c \
+                  InitExt.c \
+                  InsCmap.c \
+                  IntAtom.c \
+                  KeyBind.c \
+                  Key.h \
+                  KeysymStr.c \
+                  KillCl.c \
+                  LiHosts.c \
+                  LiICmaps.c \
+                  LiProps.c \
+                  ListExt.c \
+                  LoadFont.c \
+                  LockDis.c \
+                  locking.c \
+                  locking.h \
+                  LookupCol.c \
+                  LowerWin.c \
+                  Macros.c \
+                  MapRaised.c \
+                  MapSubs.c \
+                  MapWindow.c \
+                  MaskEvent.c \
+                  Misc.c \
+                  ModMap.c \
+                  MoveWin.c \
+                  NextEvent.c \
+                  OCWrap.c \
+                  OMWrap.c \
+                  OpenDis.c \
+                  ParseCmd.c \
+                  ParseCol.c \
+                  ParseGeom.c \
+                  PeekEvent.c \
+                  PeekIfEv.c \
+                  Pending.c \
+                  PixFormats.c \
+                  PmapBgnd.c \
+                  PmapBord.c \
+                  poly.h \
+                  PolyReg.c \
+                  PolyTxt16.c \
+                  PolyTxt.c \
+                  PropAlloc.c \
+                  PutBEvent.c \
+                  PutImage.c \
+                  Quarks.c \
+                  QuBest.c \
+                  QuColor.c \
+                  QuColors.c \
+                  QuCurShp.c \
+                  QuExt.c \
+                  QuKeybd.c \
+                  QuPntr.c \
+                  QuStipShp.c \
+                  QuTextE16.c \
+                  QuTextExt.c \
+                  QuTileShp.c \
+                  QuTree.c \
+                  RaiseWin.c \
+                  RdBitF.c \
+                  RecolorC.c \
+                  ReconfWin.c \
+                  ReconfWM.c \
+                  Region.c \
+                  RegstFlt.c \
+                  RepWindow.c \
+                  RestackWs.c \
+                  RotProp.c \
+                  ScrResStr.c \
+                  SelInput.c \
+                  SendEvent.c \
+                  SetBack.c \
+                  SetClMask.c \
+                  SetClOrig.c \
+                  SetCRects.c \
+                  SetDashes.c \
+                  SetFont.c \
+                  SetFore.c \
+                  SetFPath.c \
+                  SetFunc.c \
+                  SetHints.c \
+                  SetIFocus.c \
+                  SetLocale.c \
+                  SetLStyle.c \
+                  SetNrmHint.c \
+                  SetPMask.c \
+                  SetPntMap.c \
+                  SetRGBCMap.c \
+                  SetSOwner.c \
+                  SetSSaver.c \
+                  SetState.c \
+                  SetStCmap.c \
+                  SetStip.c \
+                  SetTile.c \
+                  SetTSOrig.c \
+                  SetTxtProp.c \
+                  SetWMCMapW.c \
+                  SetWMProto.c \
+                  StBytes.c \
+                  StColor.c \
+                  StColors.c \
+                  StName.c \
+                  StNColor.c \
+                  StrKeysym.c \
+                  StrToText.c \
+                  Sync.c \
+                  Synchro.c \
+                  Text16.c \
+                  Text.c \
+                  TextExt16.c \
+                  TextExt.c \
+                  TextToStr.c \
+                  TrCoords.c \
+                  UndefCurs.c \
+                  UngrabBut.c \
+                  UngrabKbd.c \
+                  UngrabKey.c \
+                  UngrabPtr.c \
+                  UngrabSvr.c \
+                  UninsCmap.c \
+                  UnldFont.c \
+                  UnmapSubs.c \
+                  UnmapWin.c \
+                  utlist.h \
+                  VisUtil.c \
+                  WarpPtr.c \
+                  Window.c \
+                  WinEvent.c \
+                  Withdraw.c \
+                  WMGeom.c \
+                  WMProps.c \
+                  WrBitF.c \
+                  Xatomtype.h \
+                  xcb_disp.c \
+                  xcb_io.c \
+                  Xintatom.h \
+                  Xintconn.h \
+                  XlibAsync.c \
+                  XlibInt.c \
+                  Xprivate.h \
+                  XomGeneric.h \
+                  Xresinternal.h \
+                  Xrm.c \
+                  Xxcbint.h
+
+#
+# ========================= Extra stuff ============================
+#
+
+if OS2
+libX11_la_SOURCES+=os2Stubs.c
+endif OS2
+
+if UDC
+libX11_la_SOURCES+=udcInf.c
+endif
+
+if THRSTUBS
+libX11_la_SOURCES+=UIThrStubs.c
+endif
+
+x11datadir = @X11_DATADIR@
+x11data_DATA = XErrorDB
+
+EXTRA_DIST = \
+	$(x11data_DATA) \
+	os2Stubs.c \
+	udcInf.c \
+	UIThrStubs.c 
+
+libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
+libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+libX11_xcb_la_LIBADD = libX11.la
+
+#
+# Figure out which sub-libraries to link into Xlib
+#
+
+if XLOCALE
+USE_I18N_LIBS = $(I18N_LIBS)
+endif
+
+if XCMS
+USE_XCMS_LIBS = $(XCMS_LIBS)
+endif
+
+if XKB
+USE_XKB_LIBS = $(XKB_LIBS)
+endif
+
+libX11_la_LDFLAGS = -version-number 6:3:0 -no-undefined
+
+libX11_la_LIBADD = \
+	$(USE_I18N_LIBS) \
+	$(USE_XCMS_LIBS) \
+	$(USE_XKB_LIBS) \
+	$(X11_LIBS)
+
+preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
+.c.ii:
+	$(COMPILE) -E -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+if LINT
+# Check source code with tools like lint & sparse
+
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+
+lint:	$(BUILT_SOURCES)
+	for f in $(libX11_la_SOURCES) ; do \
+		$(LINT) $(ALL_LINT_FLAGS) $$f ; \
+	done
+	@for subdir in $(SUBDIRS) ; do \
+		echo "Making $@ in src/$$subdir"; \
+		(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) lint) ; \
+	done
+endif LINT
+
+if MAKE_LINT_LIB
+lintlibdir = $(libdir)
+
+lintlib_DATA = $(LINTLIB)
+
+lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
+
+CLEANFILES += $(lintlib_DATA)
+
+$(LINTLIB): $(libX11_la_SOURCES)
+	$(AM_V_GEN)$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
+endif MAKE_LINT_LIB
+
+#
+# Building ks_tables.h requires the makekeys utility
+#
+
+KEYSYMDEFS=@KEYSYMDEFS@
+
+ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
+	$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
+	mv ks_tables_h $@
+
+$(top_builddir)/src/util/makekeys$(EXEEXT): force
+	cd util && $(MAKE)
+
+force:
diff --git a/libX11/src/Xrm.c b/libX11/src/Xrm.c
index fbc8ad293..c466cae7f 100644
--- a/libX11/src/Xrm.c
+++ b/libX11/src/Xrm.c
@@ -60,8 +60,8 @@ from The Open Group.
 #ifdef XTHREADS
 #include	"locking.h"
 #endif
-#include 	"XrmI.h"
 #include	<X11/Xos.h>
+#include	<sys/stat.h>
 #include "Xresinternal.h"
 #include "Xresource.h"
 
@@ -1594,12 +1594,13 @@ ReadInFile(_Xconst char *filename)
      * result that the number of bytes actually read with be <=
      * to the size returned by fstat.
      */
-    GetSizeOfFile(fd, size);
-
-    /* There might have been a problem trying to stat a file */
-    if (size == -1) {
-	close (fd);
-	return (char *)NULL;
+    {
+	struct stat status_buffer;
+	if ( (fstat(fd, &status_buffer)) == -1 ) {
+	    close (fd);
+	    return (char *)NULL;
+	} else
+	    size = status_buffer.st_size;
     }
 
     if (!(filebuf = Xmalloc(size + 1))) { /* leave room for '\0' */
diff --git a/libX11/src/XrmI.h b/libX11/src/XrmI.h
deleted file mode 100644
index 7e2560783..000000000
--- a/libX11/src/XrmI.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-
-Copyright 1990, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-
-/*
- * Macros to abstract out reading the file, and getting its size.
- *
- * You may need to redefine these for various other operating systems.
- */
-
-#include	<X11/Xos.h>
-#include        <sys/stat.h>
-
-#define GetSizeOfFile(fd,size)                      \
-{                                                   \
-    struct stat status_buffer;                      \
-    if ( (fstat((fd), &status_buffer)) == -1 )      \
-	size = -1;                                  \
-    else                                            \
-	size = status_buffer.st_size;               \
-}