aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-07-26 10:38:46 +0200
committerMihai Moldovan <ionic@ionic.de>2017-07-26 10:38:46 +0200
commit7897834ce578dc394649ed09acb9f95fc04915ff (patch)
treea0bcbfa2c4ae1111ad3d49390c7abd0ae3a9a2ed
parent9193d11eeeea933e293acd5e0f03fa4e9887186b (diff)
parent4afc641fdd8c03bd708f50e0c3691b5de7ea1dba (diff)
downloadnx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.tar.gz
nx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.tar.bz2
nx-libs-7897834ce578dc394649ed09acb9f95fc04915ff.zip
Merge branch 'sunweaver-pr/nxcomp-autoreconf' into 3.6.x
Attributes GH PR #480: https://github.com/ArcticaProject/nx-libs/pull/480
-rw-r--r--Makefile16
-rw-r--r--debian/libxcomp-dev.install1
-rwxr-xr-xdebian/rules6
-rw-r--r--m4/nx-macros.m49
-rw-r--r--nx-X11/lib/X11/Imakefile6
-rw-r--r--nx-X11/programs/Xserver/Imakefile20
-rw-r--r--nxcomp/.gitignore23
-rw-r--r--nxcomp/Makefile.am21
-rw-r--r--nxcomp/Makefile.in333
-rw-r--r--nxcomp/configure.ac89
-rw-r--r--nxcomp/configure.in413
-rw-r--r--nxcomp/include/MD5.h (renamed from nxcomp/MD5.h)0
-rw-r--r--nxcomp/include/NX.h (renamed from nxcomp/NX.h)0
-rw-r--r--nxcomp/include/NXalert.h (renamed from nxcomp/NXalert.h)0
-rw-r--r--nxcomp/include/NXpack.h (renamed from nxcomp/NXpack.h)0
-rw-r--r--nxcomp/include/NXproto.h (renamed from nxcomp/NXproto.h)0
-rw-r--r--nxcomp/include/NXvars.h (renamed from nxcomp/NXvars.h)0
-rwxr-xr-xnxcomp/install-sh238
l---------nxcomp/m4/nx-macros.m41
-rwxr-xr-xnxcomp/mkinstalldirs34
-rw-r--r--nxcomp/nxcomp.pc.in2
-rw-r--r--nxcomp/src/ActionCache.cpp (renamed from nxcomp/ActionCache.cpp)4
-rw-r--r--nxcomp/src/ActionCache.h (renamed from nxcomp/ActionCache.h)0
-rw-r--r--nxcomp/src/Agent.cpp (renamed from nxcomp/Agent.cpp)4
-rw-r--r--nxcomp/src/Agent.h (renamed from nxcomp/Agent.h)0
-rw-r--r--nxcomp/src/Alpha.cpp (renamed from nxcomp/Alpha.cpp)4
-rw-r--r--nxcomp/src/Alpha.h (renamed from nxcomp/Alpha.h)0
-rw-r--r--nxcomp/src/Auth.cpp (renamed from nxcomp/Auth.cpp)4
-rw-r--r--nxcomp/src/Auth.h (renamed from nxcomp/Auth.h)0
-rw-r--r--nxcomp/src/Bitmap.cpp (renamed from nxcomp/Bitmap.cpp)4
-rw-r--r--nxcomp/src/Bitmap.h (renamed from nxcomp/Bitmap.h)0
-rw-r--r--nxcomp/src/BlockCache.cpp (renamed from nxcomp/BlockCache.cpp)4
-rw-r--r--nxcomp/src/BlockCache.h (renamed from nxcomp/BlockCache.h)0
-rw-r--r--nxcomp/src/BlockCacheSet.cpp (renamed from nxcomp/BlockCacheSet.cpp)4
-rw-r--r--nxcomp/src/BlockCacheSet.h (renamed from nxcomp/BlockCacheSet.h)0
-rw-r--r--nxcomp/src/ChangeGC.cpp (renamed from nxcomp/ChangeGC.cpp)4
-rw-r--r--nxcomp/src/ChangeGC.h (renamed from nxcomp/ChangeGC.h)0
-rw-r--r--nxcomp/src/ChangeProperty.cpp (renamed from nxcomp/ChangeProperty.cpp)4
-rw-r--r--nxcomp/src/ChangeProperty.h (renamed from nxcomp/ChangeProperty.h)0
-rw-r--r--nxcomp/src/Channel.cpp (renamed from nxcomp/Channel.cpp)4
-rw-r--r--nxcomp/src/Channel.h (renamed from nxcomp/Channel.h)2
-rw-r--r--nxcomp/src/ChannelCache.cpp (renamed from nxcomp/ChannelCache.cpp)4
-rw-r--r--nxcomp/src/ChannelCache.h (renamed from nxcomp/ChannelCache.h)0
-rw-r--r--nxcomp/src/ChannelEndPoint.cpp (renamed from nxcomp/ChannelEndPoint.cpp)4
-rw-r--r--nxcomp/src/ChannelEndPoint.h (renamed from nxcomp/ChannelEndPoint.h)0
-rw-r--r--nxcomp/src/ChannelStore.h (renamed from nxcomp/ChannelStore.h)0
-rw-r--r--nxcomp/src/CharCache.cpp (renamed from nxcomp/CharCache.cpp)4
-rw-r--r--nxcomp/src/CharCache.h (renamed from nxcomp/CharCache.h)0
-rw-r--r--nxcomp/src/Children.cpp (renamed from nxcomp/Children.cpp)8
-rw-r--r--nxcomp/src/ClearArea.cpp (renamed from nxcomp/ClearArea.cpp)4
-rw-r--r--nxcomp/src/ClearArea.h (renamed from nxcomp/ClearArea.h)0
-rw-r--r--nxcomp/src/ClientCache.cpp (renamed from nxcomp/ClientCache.cpp)4
-rw-r--r--nxcomp/src/ClientCache.h (renamed from nxcomp/ClientCache.h)0
-rw-r--r--nxcomp/src/ClientChannel.cpp (renamed from nxcomp/ClientChannel.cpp)56
-rw-r--r--nxcomp/src/ClientChannel.h (renamed from nxcomp/ClientChannel.h)0
-rw-r--r--nxcomp/src/ClientProxy.cpp (renamed from nxcomp/ClientProxy.cpp)4
-rw-r--r--nxcomp/src/ClientProxy.h (renamed from nxcomp/ClientProxy.h)0
-rw-r--r--nxcomp/src/ClientReadBuffer.cpp (renamed from nxcomp/ClientReadBuffer.cpp)4
-rw-r--r--nxcomp/src/ClientReadBuffer.h (renamed from nxcomp/ClientReadBuffer.h)0
-rw-r--r--nxcomp/src/ClientStore.cpp (renamed from nxcomp/ClientStore.cpp)4
-rw-r--r--nxcomp/src/ClientStore.h (renamed from nxcomp/ClientStore.h)0
-rw-r--r--nxcomp/src/Colormap.cpp (renamed from nxcomp/Colormap.cpp)4
-rw-r--r--nxcomp/src/Colormap.h (renamed from nxcomp/Colormap.h)0
-rw-r--r--nxcomp/src/ConfigureWindow.cpp (renamed from nxcomp/ConfigureWindow.cpp)4
-rw-r--r--nxcomp/src/ConfigureWindow.h (renamed from nxcomp/ConfigureWindow.h)0
-rw-r--r--nxcomp/src/Control.cpp (renamed from nxcomp/Control.cpp)4
-rw-r--r--nxcomp/src/Control.h (renamed from nxcomp/Control.h)0
-rw-r--r--nxcomp/src/CopyArea.cpp (renamed from nxcomp/CopyArea.cpp)4
-rw-r--r--nxcomp/src/CopyArea.h (renamed from nxcomp/CopyArea.h)0
-rw-r--r--nxcomp/src/CreateGC.cpp (renamed from nxcomp/CreateGC.cpp)4
-rw-r--r--nxcomp/src/CreateGC.h (renamed from nxcomp/CreateGC.h)0
-rw-r--r--nxcomp/src/CreatePixmap.cpp (renamed from nxcomp/CreatePixmap.cpp)4
-rw-r--r--nxcomp/src/CreatePixmap.h (renamed from nxcomp/CreatePixmap.h)0
-rw-r--r--nxcomp/src/DecodeBuffer.cpp (renamed from nxcomp/DecodeBuffer.cpp)4
-rw-r--r--nxcomp/src/DecodeBuffer.h (renamed from nxcomp/DecodeBuffer.h)0
-rw-r--r--nxcomp/src/EncodeBuffer.cpp (renamed from nxcomp/EncodeBuffer.cpp)4
-rw-r--r--nxcomp/src/EncodeBuffer.h (renamed from nxcomp/EncodeBuffer.h)0
-rw-r--r--nxcomp/src/FillPoly.cpp (renamed from nxcomp/FillPoly.cpp)4
-rw-r--r--nxcomp/src/FillPoly.h (renamed from nxcomp/FillPoly.h)0
-rw-r--r--nxcomp/src/Fork.cpp (renamed from nxcomp/Fork.cpp)4
-rw-r--r--nxcomp/src/Fork.h (renamed from nxcomp/Fork.h)0
-rw-r--r--nxcomp/src/FreeCache.h (renamed from nxcomp/FreeCache.h)0
-rw-r--r--nxcomp/src/GenericChannel.cpp (renamed from nxcomp/GenericChannel.cpp)4
-rw-r--r--nxcomp/src/GenericChannel.h (renamed from nxcomp/GenericChannel.h)0
-rw-r--r--nxcomp/src/GenericReadBuffer.cpp (renamed from nxcomp/GenericReadBuffer.cpp)4
-rw-r--r--nxcomp/src/GenericReadBuffer.h (renamed from nxcomp/GenericReadBuffer.h)0
-rw-r--r--nxcomp/src/GenericReply.cpp (renamed from nxcomp/GenericReply.cpp)4
-rw-r--r--nxcomp/src/GenericReply.h (renamed from nxcomp/GenericReply.h)0
-rw-r--r--nxcomp/src/GenericRequest.cpp (renamed from nxcomp/GenericRequest.cpp)4
-rw-r--r--nxcomp/src/GenericRequest.h (renamed from nxcomp/GenericRequest.h)0
-rw-r--r--nxcomp/src/GetImage.cpp (renamed from nxcomp/GetImage.cpp)4
-rw-r--r--nxcomp/src/GetImage.h (renamed from nxcomp/GetImage.h)0
-rw-r--r--nxcomp/src/GetImageReply.cpp (renamed from nxcomp/GetImageReply.cpp)4
-rw-r--r--nxcomp/src/GetImageReply.h (renamed from nxcomp/GetImageReply.h)0
-rw-r--r--nxcomp/src/GetProperty.cpp (renamed from nxcomp/GetProperty.cpp)4
-rw-r--r--nxcomp/src/GetProperty.h (renamed from nxcomp/GetProperty.h)0
-rw-r--r--nxcomp/src/GetPropertyReply.cpp (renamed from nxcomp/GetPropertyReply.cpp)4
-rw-r--r--nxcomp/src/GetPropertyReply.h (renamed from nxcomp/GetPropertyReply.h)0
-rw-r--r--nxcomp/src/ImageText16.cpp (renamed from nxcomp/ImageText16.cpp)4
-rw-r--r--nxcomp/src/ImageText16.h (renamed from nxcomp/ImageText16.h)0
-rw-r--r--nxcomp/src/ImageText8.cpp (renamed from nxcomp/ImageText8.cpp)4
-rw-r--r--nxcomp/src/ImageText8.h (renamed from nxcomp/ImageText8.h)0
-rw-r--r--nxcomp/src/IntCache.cpp (renamed from nxcomp/IntCache.cpp)4
-rw-r--r--nxcomp/src/IntCache.h (renamed from nxcomp/IntCache.h)0
-rw-r--r--nxcomp/src/InternAtom.cpp (renamed from nxcomp/InternAtom.cpp)4
-rw-r--r--nxcomp/src/InternAtom.h (renamed from nxcomp/InternAtom.h)0
-rw-r--r--nxcomp/src/Jpeg.cpp (renamed from nxcomp/Jpeg.cpp)6
-rw-r--r--nxcomp/src/Jpeg.h (renamed from nxcomp/Jpeg.h)0
-rw-r--r--nxcomp/src/Keeper.cpp (renamed from nxcomp/Keeper.cpp)4
-rw-r--r--nxcomp/src/Keeper.h (renamed from nxcomp/Keeper.h)0
-rw-r--r--nxcomp/src/List.cpp (renamed from nxcomp/List.cpp)4
-rw-r--r--nxcomp/src/List.h (renamed from nxcomp/List.h)0
-rw-r--r--nxcomp/src/ListFontsReply.cpp (renamed from nxcomp/ListFontsReply.cpp)4
-rw-r--r--nxcomp/src/ListFontsReply.h (renamed from nxcomp/ListFontsReply.h)0
-rw-r--r--nxcomp/src/Loop.cpp (renamed from nxcomp/Loop.cpp)146
-rw-r--r--nxcomp/src/MD5.c (renamed from nxcomp/MD5.c)4
-rw-r--r--nxcomp/src/Makefile.am146
-rw-r--r--nxcomp/src/Message.cpp (renamed from nxcomp/Message.cpp)4
-rw-r--r--nxcomp/src/Message.h (renamed from nxcomp/Message.h)0
-rw-r--r--nxcomp/src/Misc.cpp (renamed from nxcomp/Misc.cpp)4
-rw-r--r--nxcomp/src/Misc.h (renamed from nxcomp/Misc.h)0
-rw-r--r--nxcomp/src/NXmitshm.h (renamed from nxcomp/NXmitshm.h)0
-rw-r--r--nxcomp/src/NXrender.h (renamed from nxcomp/NXrender.h)0
-rw-r--r--nxcomp/src/OpcodeCache.h (renamed from nxcomp/OpcodeCache.h)0
-rw-r--r--nxcomp/src/OpcodeStore.cpp (renamed from nxcomp/OpcodeStore.cpp)4
-rw-r--r--nxcomp/src/OpcodeStore.h (renamed from nxcomp/OpcodeStore.h)0
-rw-r--r--nxcomp/src/Pack.c (renamed from nxcomp/Pack.c)0
-rw-r--r--nxcomp/src/Pgn.cpp (renamed from nxcomp/Pgn.cpp)4
-rw-r--r--nxcomp/src/Pgn.h (renamed from nxcomp/Pgn.h)0
-rw-r--r--nxcomp/src/Pipe.cpp (renamed from nxcomp/Pipe.cpp)4
-rw-r--r--nxcomp/src/Pipe.h (renamed from nxcomp/Pipe.h)0
-rw-r--r--nxcomp/src/PolyArc.cpp (renamed from nxcomp/PolyArc.cpp)4
-rw-r--r--nxcomp/src/PolyArc.h (renamed from nxcomp/PolyArc.h)0
-rw-r--r--nxcomp/src/PolyFillArc.cpp (renamed from nxcomp/PolyFillArc.cpp)4
-rw-r--r--nxcomp/src/PolyFillArc.h (renamed from nxcomp/PolyFillArc.h)0
-rw-r--r--nxcomp/src/PolyFillRectangle.cpp (renamed from nxcomp/PolyFillRectangle.cpp)4
-rw-r--r--nxcomp/src/PolyFillRectangle.h (renamed from nxcomp/PolyFillRectangle.h)0
-rw-r--r--nxcomp/src/PolyLine.cpp (renamed from nxcomp/PolyLine.cpp)4
-rw-r--r--nxcomp/src/PolyLine.h (renamed from nxcomp/PolyLine.h)0
-rw-r--r--nxcomp/src/PolyPoint.cpp (renamed from nxcomp/PolyPoint.cpp)4
-rw-r--r--nxcomp/src/PolyPoint.h (renamed from nxcomp/PolyPoint.h)0
-rw-r--r--nxcomp/src/PolySegment.cpp (renamed from nxcomp/PolySegment.cpp)4
-rw-r--r--nxcomp/src/PolySegment.h (renamed from nxcomp/PolySegment.h)0
-rw-r--r--nxcomp/src/PolyText16.cpp (renamed from nxcomp/PolyText16.cpp)4
-rw-r--r--nxcomp/src/PolyText16.h (renamed from nxcomp/PolyText16.h)0
-rw-r--r--nxcomp/src/PolyText8.cpp (renamed from nxcomp/PolyText8.cpp)4
-rw-r--r--nxcomp/src/PolyText8.h (renamed from nxcomp/PolyText8.h)0
-rw-r--r--nxcomp/src/Proxy.cpp (renamed from nxcomp/Proxy.cpp)34
-rw-r--r--nxcomp/src/Proxy.h (renamed from nxcomp/Proxy.h)0
-rw-r--r--nxcomp/src/ProxyReadBuffer.cpp (renamed from nxcomp/ProxyReadBuffer.cpp)4
-rw-r--r--nxcomp/src/ProxyReadBuffer.h (renamed from nxcomp/ProxyReadBuffer.h)0
-rw-r--r--nxcomp/src/PutImage.cpp (renamed from nxcomp/PutImage.cpp)4
-rw-r--r--nxcomp/src/PutImage.h (renamed from nxcomp/PutImage.h)0
-rw-r--r--nxcomp/src/PutPackedImage.cpp (renamed from nxcomp/PutPackedImage.cpp)4
-rw-r--r--nxcomp/src/PutPackedImage.h (renamed from nxcomp/PutPackedImage.h)0
-rw-r--r--nxcomp/src/QueryFontReply.cpp (renamed from nxcomp/QueryFontReply.cpp)4
-rw-r--r--nxcomp/src/QueryFontReply.h (renamed from nxcomp/QueryFontReply.h)0
-rw-r--r--nxcomp/src/ReadBuffer.cpp (renamed from nxcomp/ReadBuffer.cpp)4
-rw-r--r--nxcomp/src/ReadBuffer.h (renamed from nxcomp/ReadBuffer.h)0
-rw-r--r--nxcomp/src/RenderAddGlyphs.cpp (renamed from nxcomp/RenderAddGlyphs.cpp)4
-rw-r--r--nxcomp/src/RenderAddGlyphs.h (renamed from nxcomp/RenderAddGlyphs.h)0
-rw-r--r--nxcomp/src/RenderChangePicture.cpp (renamed from nxcomp/RenderChangePicture.cpp)4
-rw-r--r--nxcomp/src/RenderChangePicture.h (renamed from nxcomp/RenderChangePicture.h)0
-rw-r--r--nxcomp/src/RenderComposite.cpp (renamed from nxcomp/RenderComposite.cpp)4
-rw-r--r--nxcomp/src/RenderComposite.h (renamed from nxcomp/RenderComposite.h)0
-rw-r--r--nxcomp/src/RenderCompositeGlyphs.cpp (renamed from nxcomp/RenderCompositeGlyphs.cpp)4
-rw-r--r--nxcomp/src/RenderCompositeGlyphs.h (renamed from nxcomp/RenderCompositeGlyphs.h)0
-rw-r--r--nxcomp/src/RenderCreateGlyphSet.cpp (renamed from nxcomp/RenderCreateGlyphSet.cpp)4
-rw-r--r--nxcomp/src/RenderCreateGlyphSet.h (renamed from nxcomp/RenderCreateGlyphSet.h)0
-rw-r--r--nxcomp/src/RenderCreatePicture.cpp (renamed from nxcomp/RenderCreatePicture.cpp)4
-rw-r--r--nxcomp/src/RenderCreatePicture.h (renamed from nxcomp/RenderCreatePicture.h)0
-rw-r--r--nxcomp/src/RenderExtension.cpp (renamed from nxcomp/RenderExtension.cpp)4
-rw-r--r--nxcomp/src/RenderExtension.h (renamed from nxcomp/RenderExtension.h)0
-rw-r--r--nxcomp/src/RenderFillRectangles.cpp (renamed from nxcomp/RenderFillRectangles.cpp)4
-rw-r--r--nxcomp/src/RenderFillRectangles.h (renamed from nxcomp/RenderFillRectangles.h)0
-rw-r--r--nxcomp/src/RenderFreeGlyphSet.cpp (renamed from nxcomp/RenderFreeGlyphSet.cpp)4
-rw-r--r--nxcomp/src/RenderFreeGlyphSet.h (renamed from nxcomp/RenderFreeGlyphSet.h)0
-rw-r--r--nxcomp/src/RenderFreePicture.cpp (renamed from nxcomp/RenderFreePicture.cpp)4
-rw-r--r--nxcomp/src/RenderFreePicture.h (renamed from nxcomp/RenderFreePicture.h)0
-rw-r--r--nxcomp/src/RenderGenericRequest.cpp (renamed from nxcomp/RenderGenericRequest.cpp)4
-rw-r--r--nxcomp/src/RenderGenericRequest.h (renamed from nxcomp/RenderGenericRequest.h)0
-rw-r--r--nxcomp/src/RenderMinorExtensionHeaders.h (renamed from nxcomp/RenderMinorExtensionHeaders.h)0
-rw-r--r--nxcomp/src/RenderMinorExtensionMethods.h (renamed from nxcomp/RenderMinorExtensionMethods.h)0
-rw-r--r--nxcomp/src/RenderMinorExtensionTags.h (renamed from nxcomp/RenderMinorExtensionTags.h)0
-rw-r--r--nxcomp/src/RenderPictureClip.cpp (renamed from nxcomp/RenderPictureClip.cpp)4
-rw-r--r--nxcomp/src/RenderPictureClip.h (renamed from nxcomp/RenderPictureClip.h)0
-rw-r--r--nxcomp/src/RenderPictureFilter.cpp (renamed from nxcomp/RenderPictureFilter.cpp)4
-rw-r--r--nxcomp/src/RenderPictureFilter.h (renamed from nxcomp/RenderPictureFilter.h)0
-rw-r--r--nxcomp/src/RenderPictureTransform.cpp (renamed from nxcomp/RenderPictureTransform.cpp)4
-rw-r--r--nxcomp/src/RenderPictureTransform.h (renamed from nxcomp/RenderPictureTransform.h)0
-rw-r--r--nxcomp/src/RenderTrapezoids.cpp (renamed from nxcomp/RenderTrapezoids.cpp)4
-rw-r--r--nxcomp/src/RenderTrapezoids.h (renamed from nxcomp/RenderTrapezoids.h)0
-rw-r--r--nxcomp/src/RenderTriangles.cpp (renamed from nxcomp/RenderTriangles.cpp)4
-rw-r--r--nxcomp/src/RenderTriangles.h (renamed from nxcomp/RenderTriangles.h)0
-rw-r--r--nxcomp/src/Rgb.cpp (renamed from nxcomp/Rgb.cpp)4
-rw-r--r--nxcomp/src/Rgb.h (renamed from nxcomp/Rgb.h)0
-rw-r--r--nxcomp/src/Rle.cpp (renamed from nxcomp/Rle.cpp)4
-rw-r--r--nxcomp/src/Rle.h (renamed from nxcomp/Rle.h)0
-rw-r--r--nxcomp/src/SendEvent.cpp (renamed from nxcomp/SendEvent.cpp)4
-rw-r--r--nxcomp/src/SendEvent.h (renamed from nxcomp/SendEvent.h)0
-rw-r--r--nxcomp/src/SequenceQueue.cpp (renamed from nxcomp/SequenceQueue.cpp)4
-rw-r--r--nxcomp/src/SequenceQueue.h (renamed from nxcomp/SequenceQueue.h)0
-rw-r--r--nxcomp/src/ServerCache.cpp (renamed from nxcomp/ServerCache.cpp)4
-rw-r--r--nxcomp/src/ServerCache.h (renamed from nxcomp/ServerCache.h)0
-rw-r--r--nxcomp/src/ServerChannel.cpp (renamed from nxcomp/ServerChannel.cpp)80
-rw-r--r--nxcomp/src/ServerChannel.h (renamed from nxcomp/ServerChannel.h)0
-rw-r--r--nxcomp/src/ServerProxy.cpp (renamed from nxcomp/ServerProxy.cpp)4
-rw-r--r--nxcomp/src/ServerProxy.h (renamed from nxcomp/ServerProxy.h)0
-rw-r--r--nxcomp/src/ServerReadBuffer.cpp (renamed from nxcomp/ServerReadBuffer.cpp)4
-rw-r--r--nxcomp/src/ServerReadBuffer.h (renamed from nxcomp/ServerReadBuffer.h)0
-rw-r--r--nxcomp/src/ServerStore.cpp (renamed from nxcomp/ServerStore.cpp)4
-rw-r--r--nxcomp/src/ServerStore.h (renamed from nxcomp/ServerStore.h)0
-rw-r--r--nxcomp/src/SetClipRectangles.cpp (renamed from nxcomp/SetClipRectangles.cpp)4
-rw-r--r--nxcomp/src/SetClipRectangles.h (renamed from nxcomp/SetClipRectangles.h)0
-rw-r--r--nxcomp/src/SetUnpackAlpha.cpp (renamed from nxcomp/SetUnpackAlpha.cpp)4
-rw-r--r--nxcomp/src/SetUnpackAlpha.h (renamed from nxcomp/SetUnpackAlpha.h)0
-rw-r--r--nxcomp/src/SetUnpackColormap.cpp (renamed from nxcomp/SetUnpackColormap.cpp)4
-rw-r--r--nxcomp/src/SetUnpackColormap.h (renamed from nxcomp/SetUnpackColormap.h)0
-rw-r--r--nxcomp/src/SetUnpackGeometry.cpp (renamed from nxcomp/SetUnpackGeometry.cpp)4
-rw-r--r--nxcomp/src/SetUnpackGeometry.h (renamed from nxcomp/SetUnpackGeometry.h)0
-rw-r--r--nxcomp/src/ShapeExtension.cpp (renamed from nxcomp/ShapeExtension.cpp)4
-rw-r--r--nxcomp/src/ShapeExtension.h (renamed from nxcomp/ShapeExtension.h)0
-rw-r--r--nxcomp/src/Socket.cpp (renamed from nxcomp/Socket.cpp)4
-rw-r--r--nxcomp/src/Socket.h (renamed from nxcomp/Socket.h)10
-rw-r--r--nxcomp/src/Split.cpp (renamed from nxcomp/Split.cpp)4
-rw-r--r--nxcomp/src/Split.h (renamed from nxcomp/Split.h)0
-rw-r--r--nxcomp/src/StaticCompressor.cpp (renamed from nxcomp/StaticCompressor.cpp)4
-rw-r--r--nxcomp/src/StaticCompressor.h (renamed from nxcomp/StaticCompressor.h)0
-rw-r--r--nxcomp/src/Statistics.cpp (renamed from nxcomp/Statistics.cpp)4
-rw-r--r--nxcomp/src/Statistics.h (renamed from nxcomp/Statistics.h)0
-rw-r--r--nxcomp/src/Timestamp.cpp (renamed from nxcomp/Timestamp.cpp)4
-rw-r--r--nxcomp/src/Timestamp.h (renamed from nxcomp/Timestamp.h)0
-rw-r--r--nxcomp/src/TranslateCoords.cpp (renamed from nxcomp/TranslateCoords.cpp)4
-rw-r--r--nxcomp/src/TranslateCoords.h (renamed from nxcomp/TranslateCoords.h)0
-rw-r--r--nxcomp/src/Transport.cpp (renamed from nxcomp/Transport.cpp)6
-rw-r--r--nxcomp/src/Transport.h (renamed from nxcomp/Transport.h)4
-rw-r--r--nxcomp/src/Types.h (renamed from nxcomp/Types.h)0
-rw-r--r--nxcomp/src/Unpack.cpp (renamed from nxcomp/Unpack.cpp)4
-rw-r--r--nxcomp/src/Unpack.h (renamed from nxcomp/Unpack.h)0
-rw-r--r--nxcomp/src/Vars.c (renamed from nxcomp/Vars.c)0
-rw-r--r--nxcomp/src/Version.c (renamed from nxcomp/Version.c)4
-rw-r--r--nxcomp/src/WriteBuffer.cpp (renamed from nxcomp/WriteBuffer.cpp)4
-rw-r--r--nxcomp/src/WriteBuffer.h (renamed from nxcomp/WriteBuffer.h)0
-rw-r--r--nxcomp/src/XidCache.cpp (renamed from nxcomp/XidCache.cpp)4
-rw-r--r--nxcomp/src/XidCache.h (renamed from nxcomp/XidCache.h)0
-rw-r--r--nxcomp/src/Z.cpp (renamed from nxcomp/Z.cpp)4
-rw-r--r--nxcomp/src/Z.h (renamed from nxcomp/Z.h)0
-rw-r--r--nxproxy/src/Makefile.am4
248 files changed, 904 insertions, 1218 deletions
diff --git a/Makefile b/Makefile
index d38015a00..2b4e5dfbd 100644
--- a/Makefile
+++ b/Makefile
@@ -54,14 +54,7 @@ all:
test:
echo "No testing for NX (redistributed)"
-build-lite:
- cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
- cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
-
-build-full:
-# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
- cd nxcomp && autoconf && (${CONFIGURE}) && ${MAKE}
-
+build-env:
# prepare nx-X11/config/cf/nxversion.def
sed \
-e 's/###NX_VERSION_MAJOR###/$(NX_VERSION_MAJOR)/' \
@@ -74,6 +67,13 @@ build-full:
# prepare Makefiles and the nx-X11 symlinking magic
cd nx-X11 && make BuildEnv FONT_DEFINES=$(FONT_DEFINES)
+build-lite:
+ cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+ cd nxproxy && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
+
+build-full: build-env
+# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles...
+ cd nxcomp && autoreconf -vfsi && (${CONFIGURE}) && ${MAKE}
# build libNX_X11 and libNX_Xext prior to building
# nxcomp{ext,shad}.
cd nx-X11/lib && make
diff --git a/debian/libxcomp-dev.install b/debian/libxcomp-dev.install
index e27e6ecf0..f73422f40 100644
--- a/debian/libxcomp-dev.install
+++ b/debian/libxcomp-dev.install
@@ -1,4 +1,5 @@
usr/lib/*/libXcomp.so
+usr/lib/*/libXcomp.a
usr/include/*/nx/NX.h
usr/include/*/nx/NXalert.h
usr/include/*/nx/NXpack.h
diff --git a/debian/rules b/debian/rules
index b59ba83a5..864ec35b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,14 +17,10 @@ override_dh_auto_clean:
rm -Rf nx-X11/.build-exports
dh_auto_clean
-override_dh_clean:
- rm -f nx*/configure
- dh_clean
-
override_dh_install:
# remove static libs
- rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.a
+ rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcomp.la
rm debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libXcompshad.la
# remove extras, GL, and other unneeded headers
diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4
index a878602e7..816bf4003 100644
--- a/m4/nx-macros.m4
+++ b/m4/nx-macros.m4
@@ -303,12 +303,3 @@ rm -f conftest*])
FreeBSD=
test "$nxconf_cv_freebsd" = yes && FreeBSD=yes
]) # NX_BUILD_ON_FreeBSD
-
-AC_DEFUN([NX_HAS_INADDRT],
-[AC_CACHE_CHECK(for in_addr_t, nx_cv_inaddrt,
-[AC_TRY_COMPILE([#include <netinet/in.h>],[in_addr_t t; t = 1; return t;],
-nx_cv_inaddrt=yes, nx_cv_inaddrt=no)
-rm -f conftest*])
-INADDRT=
-test "$nx_cv_inaddrt" = yes && INADDRT=yes
-]) # NX_HAS_INADDRT
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index 5b289fae8..a6471bff1 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -36,9 +36,9 @@ BuildIncludes($(HEADERS),IncSubdir,..)
#if NXLibraries
#ifdef SunArchitecture
-NX_INCLUDES = -I../../../nxcomp -I/usr/sfw/include
+NX_INCLUDES = -I../../../nxcomp/include -I/usr/sfw/include
#else
-NX_INCLUDES = -I../../../nxcomp
+NX_INCLUDES = -I../../../nxcomp/include
#endif
NX_DEFINES = -DNX_TRANS_SOCKET \
@@ -81,7 +81,7 @@ NX_XCOMPLIBNAME = libXcomp.so
NX_XCOMPEXTLIBNAME = libXcompext.so
#endif
-NX_XCOMPLIBDIR = $(XTOP)/../nxcomp
+NX_XCOMPLIBDIR = $(XTOP)/../nxcomp/src/.libs
NX_XCOMPLIBLINK = Xcomp
NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME)
NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK)
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index ed49313ee..3c7e68597 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -213,12 +213,12 @@ NXAGENTDDXDIR = hw
NXAGENTDIRS = $(STDDIRS) $(FBDIR) $(MIDAMAGEDIR) $(NXAGENTDDXDIR) $(DEPDIRS)
NX_XCOMP_HEADERS = \
- ../../../nxcomp/MD5.h \
- ../../../nxcomp/NXalert.h \
- ../../../nxcomp/NX.h \
- ../../../nxcomp/NXpack.h \
- ../../../nxcomp/NXproto.h \
- ../../../nxcomp/NXvars.h \
+ ../../../nxcomp/include/MD5.h \
+ ../../../nxcomp/include/NXalert.h \
+ ../../../nxcomp/include/NX.h \
+ ../../../nxcomp/include/NXpack.h \
+ ../../../nxcomp/include/NXproto.h \
+ ../../../nxcomp/include/NXvars.h \
$(NULL)
NX_XCOMPSHAD_HEADERS = \
@@ -315,7 +315,7 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTSYSLIBS):: $(NXAGENTDIRS)
#if defined(SunArchitecture)
NXAGENTNXLIBS = -L/usr/sfw/lib \
- -L../../../nxcomp \
+ -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
-lrt \
-lXcomp \
@@ -330,7 +330,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
-lXext \
$(NULL)
#elif defined(cygwinArchitecture)
-NXAGENTNXLIBS = -L../../../nxcomp \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
-lXcomp \
-lXcompshad \
@@ -343,7 +343,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
-lXext \
$(NULL)
#elif defined(OpenBSDArchitecture)
-NXAGENTNXLIBS = -L../../../nxcomp \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nx-X11/exports/lib \
-L../../../nxcompshad/src/.libs \
-lkvm \
@@ -359,7 +359,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
-lXext \
$(NULL)
#else
-NXAGENTNXLIBS = -L../../../nxcomp \
+NXAGENTNXLIBS = -L../../../nxcomp/src/.libs \
-L../../../nxcompshad/src/.libs \
-lXcomp \
-lXcompshad \
diff --git a/nxcomp/.gitignore b/nxcomp/.gitignore
index 27a99e5b2..a148dfa93 100644
--- a/nxcomp/.gitignore
+++ b/nxcomp/.gitignore
@@ -1,2 +1,23 @@
-nxcomp.pc
Makefile
+Makefile.in
+aclocal.m4
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+config.h
+config.h.in
+libtool
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+nxcomp.pc
+src/.deps/
+src/Makefile
+src/Makefile.in
+stamp-h1
diff --git a/nxcomp/Makefile.am b/nxcomp/Makefile.am
new file mode 100644
index 000000000..ae5991c3d
--- /dev/null
+++ b/nxcomp/Makefile.am
@@ -0,0 +1,21 @@
+SUBDIRS = src
+
+pkgconfig_DATA = nxcomp.pc
+
+MAINTAINERCLEANFILES = \
+ $(srcdir)/autom4te.cache/* \
+ $(srcdir)/build-aux/* \
+ $(srcdir)/Makefile.in \
+ $(srcdir)/src/Makefile.in \
+ $(srcdir)/aclocal.m4 \
+ $(srcdir)/config.h.in \
+ $(srcdir)/config.h.in~ \
+ $(srcdir)/configure \
+ $(srcdir)/m4/libtool.m4 \
+ $(srcdir)/m4/lt~obsolete.m4 \
+ $(srcdir)/m4/ltoptions.m4 \
+ $(srcdir)/m4/ltsugar.m4 \
+ $(srcdir)/m4/ltversion.m4 \
+ $(NULL)
+
+DISTCLEANFILES=$(MAINTAINERCLEANFILES)
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
deleted file mode 100644
index f18875524..000000000
--- a/nxcomp/Makefile.in
+++ /dev/null
@@ -1,333 +0,0 @@
-#/**************************************************************************/
-#/* */
-#/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
-#/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-#/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
-#/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
-#/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-#/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
-#/* */
-#/* NXCOMP, NX protocol compression and NX extensions to this software */
-#/* are copyright of the aforementioned persons and companies. */
-#/* */
-#/* Redistribution and use of the present software is allowed according */
-#/* to terms specified in the file LICENSE.nxcomp which comes in the */
-#/* source distribution. */
-#/* */
-#/* All rights reserved. */
-#/* */
-#/* NOTE: This software has received contributions from various other */
-#/* contributors, only the core maintainers and supporters are listed as */
-#/* copyright holders. Please contact us, if you feel you should be listed */
-#/* as copyright holder, as well. */
-#/* */
-#/**************************************************************************/
-
-#
-# Get these values from the configure script. The
-# version printed by the program should be derived
-# from the CHANGELOG. For example we may use the
-# following command:
-#
-# head -n 3 CHANGELOG | grep 'nxcomp-' | cut -d '-' -f 2-3
-#
-
-VERSION=@VERSION@
-LIBVERSION=@LIBVERSION@
-
-#
-# We would really like to enable all warnings, -Wredundant-decls,
-# though, gives a warning caused by pthread.h and unistd.h and
-# GCC 3.4 was changed in a way that it now complains about some
-# of the -W directives we used before (-Wmissing-declarations,
-# -Wnested-externs, -Wstrict-prototypes and -Wmissing-prototypes).
-#
-
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
- -Wall -Wpointer-arith
-CXXINCLUDES =
-CXXDEFINES =
-
-CPPFLAGS = @CPPFLAGS@
-
-#
-# C programs have their own CFLAGS.
-#
-
-CC = @CC@
-CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
- -Wall -Wpointer-arith
-CCINCLUDES =
-CCDEFINES =
-
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-
-#
-# Other autoconfigured settings, not used at the moment.
-#
-
-srcdir = @srcdir@
-prefix = @prefix@
-datarootdir = @datarootdir@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-man1dir = @mandir@/man1
-VPATH = @srcdir@
-libdir = @libdir@
-includedir = @includedir@
-pkgconfigdir = @pkgconfigdir@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_LINK = cp -av
-DESTDIR =
-RM_FILE = rm -f
-
-#
-# This should be autodetected.
-#
-
-MAKEDEPEND = @MAKEDEPEND@
-DEPENDINCLUDES = -I/usr/include/c++ -I/usr/include/g++ -I/usr/include/g++-3
-
-.SUFFIXES: .cpp.c
-
-.cpp.o:
- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CXXINCLUDES) $(CXXDEFINES) $<
-.c.o:
- $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CCINCLUDES) $(CCDEFINES) $<
-
-LIBRARY = Xcomp
-
-LIBNAME = lib$(LIBRARY)
-ifeq ($(shell uname),Darwin)
-LIBFULL = lib$(LIBRARY).$(VERSION).dylib
-LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib
-LIBSHARED = lib$(LIBRARY).dylib
-COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3)
-LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER)
-else
-LIBFULL = lib$(LIBRARY).so.$(VERSION)
-LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION)
-LIBSHARED = lib$(LIBRARY).so
-LIBFLAGS =
-endif
-LIBARCHIVE = lib$(LIBRARY).a
-
-LIBCYGSHARED = cyg$(LIBRARY).dll
-LIBCYGARCHIVE = lib$(LIBRARY).dll.a
-
-all: depend @ALL@
-
-MSRC =
-
-CSRC = MD5.c \
- Pack.c \
- Vars.c \
- Version.c
-
-CXXSRC = Loop.cpp \
- Children.cpp \
- Control.cpp \
- Misc.cpp \
- Socket.cpp \
- Fork.cpp \
- Pipe.cpp \
- List.cpp \
- Keeper.cpp \
- Timestamp.cpp \
- Transport.cpp \
- Statistics.cpp \
- Auth.cpp \
- Agent.cpp \
- Proxy.cpp \
- Channel.cpp \
- Message.cpp \
- Split.cpp \
- ClientProxy.cpp \
- ServerProxy.cpp \
- OpcodeStore.cpp \
- ClientStore.cpp \
- ServerStore.cpp \
- ChannelCache.cpp \
- ClientCache.cpp \
- ServerCache.cpp \
- ClientChannel.cpp \
- ServerChannel.cpp \
- GenericChannel.cpp \
- ChannelEndPoint.cpp \
- ReadBuffer.cpp \
- ProxyReadBuffer.cpp \
- ClientReadBuffer.cpp \
- ServerReadBuffer.cpp \
- GenericReadBuffer.cpp \
- EncodeBuffer.cpp \
- DecodeBuffer.cpp \
- WriteBuffer.cpp \
- SequenceQueue.cpp \
- IntCache.cpp \
- CharCache.cpp \
- XidCache.cpp \
- ActionCache.cpp \
- BlockCache.cpp \
- BlockCacheSet.cpp \
- StaticCompressor.cpp \
- Unpack.cpp \
- Alpha.cpp \
- Colormap.cpp \
- Jpeg.cpp \
- Pgn.cpp \
- Bitmap.cpp \
- Rgb.cpp \
- Rle.cpp \
- Z.cpp \
- ChangeProperty.cpp \
- SendEvent.cpp \
- ChangeGC.cpp \
- CreateGC.cpp \
- CreatePixmap.cpp \
- SetClipRectangles.cpp \
- CopyArea.cpp \
- PolyLine.cpp \
- PolySegment.cpp \
- PolyFillRectangle.cpp \
- PutImage.cpp \
- TranslateCoords.cpp \
- GetImage.cpp \
- ClearArea.cpp \
- ConfigureWindow.cpp \
- PolyText8.cpp \
- PolyText16.cpp \
- ImageText8.cpp \
- ImageText16.cpp \
- PolyPoint.cpp \
- PolyFillArc.cpp \
- PolyArc.cpp \
- FillPoly.cpp \
- InternAtom.cpp \
- GetProperty.cpp \
- SetUnpackGeometry.cpp \
- SetUnpackColormap.cpp \
- SetUnpackAlpha.cpp \
- PutPackedImage.cpp \
- ShapeExtension.cpp \
- RenderExtension.cpp \
- GenericRequest.cpp \
- QueryFontReply.cpp \
- ListFontsReply.cpp \
- GetImageReply.cpp \
- GetPropertyReply.cpp \
- GenericReply.cpp \
- RenderGenericRequest.cpp \
- RenderCreatePicture.cpp \
- RenderChangePicture.cpp \
- RenderFreePicture.cpp \
- RenderPictureClip.cpp \
- RenderPictureTransform.cpp \
- RenderPictureFilter.cpp \
- RenderCreateGlyphSet.cpp \
- RenderFreeGlyphSet.cpp \
- RenderAddGlyphs.cpp \
- RenderComposite.cpp \
- RenderCompositeGlyphs.cpp \
- RenderFillRectangles.cpp \
- RenderTrapezoids.cpp \
- RenderTriangles.cpp
-
-MOBJ = $(MSRC:.c=.o)
-COBJ = $(CSRC:.c=.o)
-CXXOBJ = $(CXXSRC:.cpp=.o)
-
-$(LIBFULL): $(CXXOBJ) $(COBJ)
- $(CXX) -o $@ $(LDFLAGS) $(LIBFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
-
-$(LIBLOAD): $(LIBFULL)
- rm -f $(LIBLOAD)
- ln -s $(LIBFULL) $(LIBLOAD)
-
-$(LIBSHARED): $(LIBFULL)
- rm -f $(LIBSHARED)
- ln -s $(LIBFULL) $(LIBSHARED)
-
-$(LIBARCHIVE): $(CXXOBJ) $(COBJ)
- rm -f $(LIBARCHIVE)
- ar clq $(LIBARCHIVE) $(CXXOBJ) $(COBJ)
- ranlib $(LIBARCHIVE)
-
-$(LIBCYGSHARED): $(LIBARCHIVE)
- $(CC) -shared -o $(LIBCYGSHARED) \
- -Wl,--out-implib=$(LIBCYGARCHIVE) \
- -Wl,--export-all-symbols \
- -Wl,--enable-auto-import \
- -Wl,--whole-archive $(LIBARCHIVE) \
- -Wl,--no-whole-archive $(LIBS) \
- $(LDFLAGS)
-
-$(LIBCYGARCHIVE): $(LIBCYGSHARED)
-
-depends: depend.status
-
-depend: depend.status
-
-depend.status:
- if [ -n "$(MAKEDEPEND)" ] && [ -x "$(MAKEDEPEND)" ] ; then \
- $(MAKEDEPEND) $(CXXINCLUDES) $(CCINCLUDES) \
- $(DEPENDINCLUDES) -f Makefile $(MSRC) $(CSRC) \
- $(CXXSRC) 2>/dev/null; \
- fi
- touch depend.status
-
-install: install.bin install.lib install.man
-
-install.bin:
-
-install.lib: all
- ./mkinstalldirs $(DESTDIR)${libdir}
- ./mkinstalldirs $(DESTDIR)${includedir}/nx
- ./mkinstalldirs $(DESTDIR)${pkgconfigdir}
- $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}
- $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}
- $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}
- $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir}
- $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) NX.h $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) NXalert.h $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) NXpack.h $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) NXproto.h $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) NXvars.h $(DESTDIR)${includedir}/nx
- $(INSTALL_DATA) nxcomp.pc $(DESTDIR)${pkgconfigdir}
- echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-
-install.man:
-
-uninstall: uninstall.bin uninstall.lib uninstall.man
-
-uninstall.bin:
-
-uninstall.lib:
- $(RM_FILE) $(DESTDIR)${libdir}/$(LIBFULL)
- $(RM_FILE) $(DESTDIR)${libdir}/$(LIBLOAD)
- $(RM_FILE) $(DESTDIR)${libdir}/$(LIBSHARED)
- $(RM_FILE) $(DESTDIR)${libdir}/$(LIBARCHIVE)
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXpack.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXproto.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/NXvars.h
- $(RM_FILE) $(DESTDIR)${includedir}/nx/MD5.h
- $(RM_FILE) $(DESTDIR)${pkgconfigdir}/nxcomp.pc
- echo "Running ldconfig tool, this may take a while..." && ldconfig || true
-
-uninstall.man:
-
-clean:
- -rm -f *~ *.o *.bak *.orig *.rej st?????? core core.* *.out.* *.pc \
- @ALL@
-
-distclean: clean
- -rm -rf autom4te.cache config.status config.log \
- config.cache depend.status Makefile tags configure
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
new file mode 100644
index 000000000..42407c6fd
--- /dev/null
+++ b/nxcomp/configure.ac
@@ -0,0 +1,89 @@
+# ***************************************************************************
+# *** configure.ac for nxcomp ***
+# ***************************************************************************
+
+m4_define([nxcomp_version], m4_esyscmd([tr -d '\n' < VERSION]))
+
+# Initialize Autoconf
+AC_PREREQ(2.60)
+
+AC_INIT([libXcomp], [nxcomp_version], [https://github.com/ArcticaProject/nx-libs/issues])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_PROG_CXX
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([foreign no-dist-gzip dist-xz])
+
+# Initialize libtool
+AC_PROG_LIBTOOL
+
+COMP_VERSION=nxcomp_version
+AC_SUBST([COMP_VERSION])
+
+LT_COMP_VERSION=[`echo $COMP_VERSION | sed -r -e 's/^([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' -e 's/\./:/g'`]
+AC_SUBST([LT_COMP_VERSION])
+
+PKG_CHECK_MODULES(JPEG, libjpeg)
+PKG_CHECK_MODULES(PNG, libpng)
+PKG_CHECK_MODULES(Z, zlib)
+
+# Upstream's pkg.m4 (since 0.27) offers this now, but define our own
+# compatible version in case the local version of pkgconfig isn't new enough.
+# https://bugs.freedesktop.org/show_bug.cgi?id=48743
+m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR],
+ [AC_ARG_WITH([pkgconfigdir],
+ [AS_HELP_STRING([--with-pkgconfigdir],
+ [install directory for nxcompshad.pc pkg-config file])],
+ [],[with_pkgconfigdir='$(libdir)/pkgconfig'])
+ AC_SUBST([pkgconfigdir], [${with_pkgconfigdir}])])
+
+AC_LANG([C++])
+NX_COMPILER_BRAND
+NX_COMPILER_FLAGS
+
+NX_BUILD_ON_CYGWIN32
+NX_BUILD_ON_AMD64
+NX_BUILD_ON_DARWIN
+NX_BUILD_ON_SUN
+NX_BUILD_ON_FreeBSD
+
+# Build PIC libraries.
+
+if test "$CYGWIN32" != yes -a "$DARWIN" != yes; then
+ CXXFLAGS="$CXXFLAGS -fPIC"
+ CFLAGS="$CFLAGS -fPIC"
+fi
+
+# On FreeBSD search libraries and includes under /usr/local.
+
+if test "$FreeBSD" = yes; then
+ LIBS="$LIBS -L/usr/local/lib"
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+fi
+
+# If in_addr_t is not defined use unsigned int.
+AC_CHECK_TYPES([in_addr_t], [], [], [[#include <netinet/in.h>]])
+
+AC_ARG_ENABLE(info,
+ [AS_HELP_STRING([--enable-debug], [enable to get info session log output (disabled by default)])],
+ [if test x$enableval = xyes; then
+ AC_DEFINE(INFO, 1, [Define this to get info session log output.])
+ info_messages=yes
+ fi])
+
+AC_ARG_ENABLE(valgrind,
+ [AS_HELP_STRING([--enable-valgrind], [enable for extra valgrind hacks (disabled by default)])],
+ [if test x$enableval = xyes; then
+ AC_DEFINE(VALGRIND, 1, [Define this for extra valgrind hacks.])
+ valgrind_hacks=yes
+ fi])
+
+AC_CONFIG_FILES([
+Makefile
+src/Makefile
+nxcomp.pc
+])
+
+AC_OUTPUT
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
deleted file mode 100644
index 8be604836..000000000
--- a/nxcomp/configure.in
+++ /dev/null
@@ -1,413 +0,0 @@
-dnl /**************************************************************************/
-dnl /* */
-dnl /* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
-dnl /* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
-dnl /* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
-dnl /* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
-dnl /* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-dnl /* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
-dnl /* */
-dnl /* NXCOMP, NX protocol compression and NX extensions to this software */
-dnl /* are copyright of the aforementioned persons and companies. */
-dnl /* */
-dnl /* Redistribution and use of the present software is allowed according */
-dnl /* to terms specified in the file LICENSE.nxcomp which comes in the */
-dnl /* source distribution. */
-dnl /* */
-dnl /* All rights reserved. */
-dnl /* */
-dnl /* NOTE: This software has received contributions from various other */
-dnl /* contributors, only the core maintainers and supporters are listed as */
-dnl /* copyright holders. Please contact us, if you feel you should be listed */
-dnl /* as copyright holder, as well. */
-dnl /* */
-dnl /**************************************************************************/
-
-
-dnl Process this file with autoconf to produce a configure script.
-
-dnl Prolog
-
-AC_INIT(NX.h)
-AC_PREREQ(2.13)
-
-pkgconfigdir=${libdir}/pkgconfig
-AC_SUBST(pkgconfigdir)
-
-dnl Set our default compilation flags.
-
-if test "x$CXXFLAGS" = "x"; then
- CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
-fi
-if test "x$CFLAGS" = "x"; then
- CFLAGS="$CFLAGS -O3"
-fi
-
-dnl Reset default linking directives.
-
-LIBSTATIC=""
-LIBSHARED=""
-
-dnl Prefer headers and libraries from nx-X11, if present.
-
-if test -d "../nx-X11/include" ; then
- CXXFLAGS="$CXXFLAGS -I../nx-X11/exports/include"
- CFLAGS="$CFLAGS -I../nx-X11/exports/include"
- LIBS="$LIBS -L../nx-X11/exports/lib"
-fi
-
-dnl Check whether --with-ipaq was given.
-
-if test "${with_ipaq}" = yes; then
- echo -e "enabling IPAQ configuration"
- CXX="arm-linux-c++"
- CC="arm-linux-gcc"
- unset ac_cv_prog_armcxx
- unset ac_cv_prog_armcc
- unset ac_cv_prog_CXXCPP
- AC_CHECK_PROG([armcxx],["$CXX"],[yes],[no],[$PATH])
- AC_CHECK_PROG([armcc],["$CC"],[yes],[no],[$PATH])
- if test $armcxx = "yes" && test $armcc = "yes" ; then
- ac_cv_prog_CXX="$CXX"
- ac_cv_prog_CC="$CC"
- else
- AC_MSG_ERROR(Installation or configuration problem. Cannot find compiler for arm-linux.)
- fi
-else
- unset ac_cv_prog_CXX
- unset ac_cv_prog_CC
- unset ac_cv_prog_CXXCPP
-fi
-
-dnl Check for programs.
-
-AC_PROG_CXX
-AC_PROG_CC
-AC_LANG_CPLUSPLUS
-
-dnl Check whether option -Wno-deprecated
-dnl is needed by GCC compiler.
-
-AC_MSG_CHECKING([whether compiler needs -Wno-deprecated])
-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
-case "${gcc_version}" in
- gcc*)
- AC_MSG_RESULT([yes])
- CXXFLAGS="$CXXFLAGS -Wno-deprecated"
- ;;
-
- *)
- AC_MSG_RESULT([no])
- ;;
-esac
-
-AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations])
-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
-case "${gcc_version}" in
- gcc*)
- AC_MSG_RESULT([no])
- ;;
-
- *)
- AC_MSG_RESULT([yes])
- CXXFLAGS="$CXXFLAGS -Wmissing-declarations"
- ;;
-esac
-
-dnl Check for BSD compatible install.
-
-AC_PROG_INSTALL
-
-dnl Check for extra header files.
-
-AC_PATH_XTRA
-
-dnl Custom addition.
-
-ac_help="$ac_help
- --with-symbols add the -g flag to produce the debug symbols
- --with-use-malloc add the __USE_MALLOC flag to avoid the STL allocators
- --with-info define INFO at compile time to get basic log output
- --with-valgrind clean up allocated buffers to avoid valgrind warnings
- --with-version use this version for produced libraries
-
- --with-static-png enable static linking of PNG library
- --with-static-jpeg enable static linking of JPEG library
- --with-static-z enable static linking of Z library"
-
-dnl Check to see if we're running under Cygwin32.
-
-AC_DEFUN(nxconf_CYGWIN32,
-[AC_CACHE_CHECK(for Cygwin32 environment, nxconf_cv_cygwin32,
-[AC_TRY_COMPILE(,[return __CYGWIN32__;],
-nxconf_cv_cygwin32=yes, nxconf_cv_cygwin32=no)
-rm -f conftest*])
-CYGWIN32=
-test "$nxconf_cv_cygwin32" = yes && CYGWIN32=yes])
-nxconf_CYGWIN32
-
-dnl Check whether we're building on a AMD64.
-
-AC_DEFUN(nxconf_AMD64,
-[AC_CACHE_CHECK(for Amd64 environment, nxconf_cv_amd64,
-[AC_TRY_COMPILE(,[return (__amd64__ || __x86_64__);],
-nxconf_cv_amd64=yes, nxconf_cv_amd64=no)
-rm -f conftest*])
-AMD64=
-test "$nxconf_cv_amd64" = yes && AMD64=yes])
-nxconf_AMD64
-
-dnl Check for Darwin environment.
-
-AC_DEFUN(nxconf_DARWIN,
-[AC_CACHE_CHECK(for Darwin environment, nxconf_cv_darwin,
-[AC_TRY_COMPILE(,[return __APPLE__;],
-nxconf_cv_darwin=yes, nxconf_cv_darwin=no)
-rm -f conftest*])
-DARWIN=
-test "$nxconf_cv_darwin" = yes && DARWIN=yes])
-nxconf_DARWIN
-
-dnl Check to see if we're running under Solaris.
-
-AC_DEFUN(nxconf_SUN,
-[AC_CACHE_CHECK(for Solaris environment, nxconf_cv_sun,
-[AC_TRY_COMPILE(,[return __sun;],
-nxconf_cv_sun=yes, nxconf_cv_sun=no)
-rm -f conftest*])
-SUN=
-test "$nxconf_cv_sun" = yes && SUN=yes])
-nxconf_SUN
-
-dnl Check to see if we're running under FreeBSD.
-
-AC_DEFUN(nxconf_FreeBSD,
-[AC_CACHE_CHECK(for FreeBSD environment, nxconf_cv_freebsd,
-[AC_TRY_COMPILE(,[return __FreeBSD__;],
-nxconf_cv_freebsd=yes, nxconf_cv_freebsd=no)
-rm -f conftest*])
-FreeBSD=
-test "$nxconf_cv_freebsd" = yes && FreeBSD=yes])
-nxconf_FreeBSD
-
-dnl Build PIC libraries.
-
-if test "$CYGWIN32" != yes -a "$DARWIN" != yes; then
- CXXFLAGS="$CXXFLAGS -fPIC"
- CFLAGS="$CFLAGS -fPIC"
-fi
-
-dnl Solaris requires the socket and gcc_s libs explicitly linked.
-dnl Note also that headers from default /usr/openwin/include/X11
-dnl cause a warning due to pragma in Xmd.h.
-
-if test "$SUN" = yes; then
- LIBS="$LIBS -L/usr/sfw/lib -lsocket "
- CXXFLAGS="$CXXFLAGS -I/usr/sfw/include"
- CFLAGS="$CFLAGS -I/usr/sfw/include"
-fi
-
-dnl On FreeBSD search libraries and includes under /usr/local.
-
-if test "$FreeBSD" = yes; then
- LIBS="$LIBS -L/usr/local/lib"
- CXXFLAGS="$CXXFLAGS -I/usr/local/include"
- CFLAGS="$CFLAGS -I/usr/local/include"
-fi
-
-dnl Under Darwin we don't have support for -soname option and
-dnl we need the -dynamiclib flag. Under Solaris, instead, we need
-dnl the options -G -h.
-
-if test "$DARWIN" = yes; then
- LDFLAGS="$LDFLAGS -dynamiclib"
-elif test "$SUN" = yes; then
- LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
-else
- LDFLAGS="$LDFLAGS -Wl,-soname,\$(LIBLOAD)"
-fi
-
-dnl Check to see if in_addr_t is defined.
-dnl Could use a specific configure test.
-
-AC_DEFUN(nxconf_INADDRT,
-[AC_CACHE_CHECK(for in_addr_t, nxconf_cv_inaddrt,
-[AC_TRY_COMPILE([#include <netinet/in.h>],[in_addr_t t; t = 1; return t;],
-nxconf_cv_inaddrt=yes, nxconf_cv_inaddrt=no)
-rm -f conftest*])
-INADDRT=
-test "$nxconf_cv_inaddrt" = yes && INADDRT=yes])
-nxconf_INADDRT
-
-dnl If in_addr_t is not defined use unsigned int.
-
-if test "$INADDRT" != yes ; then
- echo -e "using unsigned int for type in_addr_t"
- CXXFLAGS="$CXXFLAGS -DIN_ADDR_T=unsigned"
- CFLAGS="$CFLAGS -DIN_ADDR_T=unsigned"
-else
- CXXFLAGS="$CXXFLAGS -DIN_ADDR_T=in_addr_t"
- CFLAGS="$CFLAGS -DIN_ADDR_T=in_addr_t"
-fi
-
-dnl Check whether --with-version was given.
-
-AC_SUBST(LIBVERSION)
-AC_SUBST(VERSION)
-if test "${with_version}" = yes; then
- VERSION=${ac_option}
-else
- VERSION=`cat VERSION`
-fi
-echo -e "compiling version ${VERSION}"
-
-LIBVERSION=`echo ${VERSION} | cut -d '.' -f 1`
-
-CXXFLAGS="$CXXFLAGS -DVERSION=\\\"${VERSION}\\\""
-CFLAGS="$CFLAGS -DVERSION=\\\"${VERSION}\\\""
-
-dnl Check whether --with-static-png was given and
-dnl add -lpng or libpng.a to linking.
-
-if test "${with_static_png}" = yes; then
- echo -e "enabling static linking of PNG library"
- if test "$SUN" = yes && test -f "/usr/sfw/lib/libpng.a"; then
- LIBSTATIC="$LIBSTATIC /usr/sfw/lib/libpng.a"
- else
- if test -f "/usr/lib/libpng.a" ; then
- LIBSTATIC="$LIBSTATIC /usr/lib/libpng.a"
- else
- if test -f "/usr/local/lib/libpng.a" ; then
- echo -e "assuming libpng.a in /usr/local/lib"
- LIBSTATIC="$LIBSTATIC /usr/local/lib/libpng.a"
- else
- echo -e "Warning: assuming libpng.a in the local path"
- LIBSTATIC="$LIBSTATIC libpng.a"
- fi
- fi
- fi
-else
- echo -e "enabling dynamic linking of PNG library"
- LIBSHARED="$LIBSHARED -lpng"
-fi
-
-dnl Check whether --with-static-jpeg was given and
-dnl add -ljpeg or libjpeg.a to linking.
-
-if test "${with_static_jpeg}" = yes; then
- echo -e "enabling static linking of JPEG library"
- if test "$SUN" = yes && test -f "/usr/sfw/lib/libjpeg.a"; then
- LIBSTATIC="$LIBSTATIC /usr/sfw/lib/libjpeg.a"
- else
- if test -f "/usr/lib/libjpeg.a" ; then
- LIBSTATIC="$LIBSTATIC /usr/lib/libjpeg.a"
- else
- if test -f "/usr/local/lib/libjpeg.a" ; then
- echo -e "assuming libjpeg.a in /usr/local/lib"
- LIBSTATIC="$LIBSTATIC /usr/local/lib/libjpeg.a"
- else
- echo -e "Warning: assuming libjpeg.a in the local path"
- LIBSTATIC="$LIBSTATIC libjpeg.a"
- fi
- fi
- fi
-else
- echo -e "enabling dynamic linking of JPEG library"
- LIBSHARED="$LIBSHARED -ljpeg"
-fi
-
-dnl Check whether --with-static-z was given and
-dnl add -lz or libz.a to linking.
-
-if test "${with_static_z}" = yes; then
- echo -e "enabling static linking of Z library"
- if test "$SUN" = yes && test -f "/usr/sfw/lib/libz.a"; then
- LIBSTATIC="$LIBSTATIC /usr/sfw/lib/libz.a"
- else
- if test -f "/usr/lib/libz.a" ; then
- LIBSTATIC="$LIBSTATIC /usr/lib/libz.a"
- else
- if test -f "/usr/local/lib/libz.a" ; then
- echo -e "assuming libz.a in /usr/local/lib"
- LIBSTATIC="$LIBSTATIC /usr/local/lib/libz.a"
- else
- echo -e "Warning: assuming libz.a in the local path"
- LIBSTATIC="$LIBSTATIC libz.a"
- fi
- fi
- fi
-else
- echo -e "enabling dynamic linking of Z library"
- LIBSHARED="$LIBSHARED -lz"
-fi
-
-dnl Finally compose the LIB variable.
-
-if test "$DARWIN" = yes ; then
- LIBS="$LIBS $LIBSTATIC $LIBSHARED"
-elif test "$SUN" = yes ; then
- LIBS="$LIBS $LIBSTATIC $LIBSHARED"
-else
- LIBS="$LIBS $LIBSTATIC -shared $LIBSHARED"
-fi
-
-dnl Check whether --with-symbols or --without-symbols was
-dnl given and set the required optimization level.
-
-if test "${with_symbols}" = yes; then
- echo -e "enabling production of debug symbols"
- CXXFLAGS="-g $CXXFLAGS"
- CFLAGS="-g $CFLAGS"
-else
- echo -e "disabling production of debug symbols"
-fi
-
-dnl Check whether --with-use-malloc or --without-use-malloc
-dnl was given.
-
-if test "${with_use_malloc}" = yes; then
- echo -e "disabling use of the STL allocators"
- CXXFLAGS="$CXXFLAGS -D__USE_MALLOC"
-else
- echo -e "enabling use of the STL allocators"
-fi
-
-dnl Check whether --with-info or --without-info was given.
-
-if test "${with_info}" = yes; then
- echo -e "enabling info output in the log file"
- CXXFLAGS="$CXXFLAGS -DINFO"
- CFLAGS="$CFLAGS -DINFO"
-else
- echo -e "disabling info output in the log file"
-fi
-
-dnl Check whether --with-valgrind or --without-valgrind was given.
-
-if test "${with_valgrind}" = yes; then
- echo -e "enabling valgrind memory checker workarounds"
- CXXFLAGS="$CXXFLAGS -DVALGRIND"
- CFLAGS="$CFLAGS -DVALGRIND"
-else
- echo -e "disabling valgrind memory checker workarounds"
-fi
-
-dnl Find makedepend somewhere.
-
-AC_SUBST(MAKEDEPEND)
-MAKEDEPEND="$(which makedepend)"
-
-dnl Determine what to build based on the platform.
-dnl Override the LIBS settings on Cygwin32 so that
-dnl we always link with the exact set of libraries.
-
-AC_SUBST(ALL)
-
-if test "$CYGWIN32" = yes; then
- ALL="\$(LIBCYGARCHIVE) \$(LIBCYGSHARED) \$(LIBARCHIVE)"
- LIBS="-lstdc++ -lpng -ljpeg -lz"
-else
- ALL="\$(LIBFULL) \$(LIBLOAD) \$(LIBSHARED) \$(LIBARCHIVE)"
-fi
-
-AC_OUTPUT(Makefile nxcomp.pc)
diff --git a/nxcomp/MD5.h b/nxcomp/include/MD5.h
index 698c995d8..698c995d8 100644
--- a/nxcomp/MD5.h
+++ b/nxcomp/include/MD5.h
diff --git a/nxcomp/NX.h b/nxcomp/include/NX.h
index 7ec79b4b1..7ec79b4b1 100644
--- a/nxcomp/NX.h
+++ b/nxcomp/include/NX.h
diff --git a/nxcomp/NXalert.h b/nxcomp/include/NXalert.h
index dca2f44ca..dca2f44ca 100644
--- a/nxcomp/NXalert.h
+++ b/nxcomp/include/NXalert.h
diff --git a/nxcomp/NXpack.h b/nxcomp/include/NXpack.h
index 3eade6855..3eade6855 100644
--- a/nxcomp/NXpack.h
+++ b/nxcomp/include/NXpack.h
diff --git a/nxcomp/NXproto.h b/nxcomp/include/NXproto.h
index 7b988bdbf..7b988bdbf 100644
--- a/nxcomp/NXproto.h
+++ b/nxcomp/include/NXproto.h
diff --git a/nxcomp/NXvars.h b/nxcomp/include/NXvars.h
index f514000d7..f514000d7 100644
--- a/nxcomp/NXvars.h
+++ b/nxcomp/include/NXvars.h
diff --git a/nxcomp/install-sh b/nxcomp/install-sh
deleted file mode 100755
index 58719246f..000000000
--- a/nxcomp/install-sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#! /bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd="$cpprog"
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd="$stripprog"
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-if [ x"$src" = x ]
-then
- echo "install: no input file specified"
- exit 1
-else
- true
-fi
-
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d $dst ]; then
- instcmd=:
- else
- instcmd=mkdir
- fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
- if [ -f $src -o -d $src ]
- then
- true
- else
- echo "install: $src does not exist"
- exit 1
- fi
-
- if [ x"$dst" = x ]
- then
- echo "install: no destination specified"
- exit 1
- else
- true
- fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
- if [ -d $dst ]
- then
- dst="$dst"/`basename $src`
- else
- true
- fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
- pathcomp="${pathcomp}${1}"
- shift
-
- if [ ! -d "${pathcomp}" ] ;
- then
- $mkdirprog "${pathcomp}"
- else
- true
- fi
-
- pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd $dst &&
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename $dst`
- else
- dstfile=`basename $dst $transformbasename |
- sed $transformarg`$transformbasename
- fi
-
-# don't allow the sed command to completely eliminate the filename
-
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename $dst`
- else
- true
- fi
-
-# Make a temp file name in the proper directory.
-
- dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
- $doit $instcmd $src $dsttmp &&
-
- trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
- $doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
-
-fi &&
-
-
-exit 0
diff --git a/nxcomp/m4/nx-macros.m4 b/nxcomp/m4/nx-macros.m4
new file mode 120000
index 000000000..813e9b041
--- /dev/null
+++ b/nxcomp/m4/nx-macros.m4
@@ -0,0 +1 @@
+../../m4/nx-macros.m4 \ No newline at end of file
diff --git a/nxcomp/mkinstalldirs b/nxcomp/mkinstalldirs
deleted file mode 100755
index 936cf3407..000000000
--- a/nxcomp/mkinstalldirs
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1995-03-05
-# Public domain
-
-errstatus=0
-
-for file in ${1+"$@"} ; do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d in ${1+"$@"} ; do
- pathcomp="$pathcomp$d"
- case "$pathcomp" in
- -* ) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
- mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
- fi
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
diff --git a/nxcomp/nxcomp.pc.in b/nxcomp/nxcomp.pc.in
index f0963aa17..26206d857 100644
--- a/nxcomp/nxcomp.pc.in
+++ b/nxcomp/nxcomp.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
Name: nxcomp
Description: NX Compression Library
-Version: @VERSION@
+Version: @COMP_VERSION@
#libjepg does not provide a pkgconfig-file, zlib does not provide it for older versions
#Requires: libjpeg zlib
Requires: libpng
diff --git a/nxcomp/ActionCache.cpp b/nxcomp/src/ActionCache.cpp
index 8ad7f7ba2..783b1724e 100644
--- a/nxcomp/ActionCache.cpp
+++ b/nxcomp/src/ActionCache.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Control.h"
#include "ActionCache.h"
diff --git a/nxcomp/ActionCache.h b/nxcomp/src/ActionCache.h
index 2aedd4a07..2aedd4a07 100644
--- a/nxcomp/ActionCache.h
+++ b/nxcomp/src/ActionCache.h
diff --git a/nxcomp/Agent.cpp b/nxcomp/src/Agent.cpp
index cd65101b3..e55620601 100644
--- a/nxcomp/Agent.cpp
+++ b/nxcomp/src/Agent.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Agent.h"
#include "Proxy.h"
diff --git a/nxcomp/Agent.h b/nxcomp/src/Agent.h
index 3e1a50ae5..3e1a50ae5 100644
--- a/nxcomp/Agent.h
+++ b/nxcomp/src/Agent.h
diff --git a/nxcomp/Alpha.cpp b/nxcomp/src/Alpha.cpp
index 31a31f7cb..6157e21e5 100644
--- a/nxcomp/Alpha.cpp
+++ b/nxcomp/src/Alpha.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Unpack.h"
#include "Alpha.h"
diff --git a/nxcomp/Alpha.h b/nxcomp/src/Alpha.h
index ea5068812..ea5068812 100644
--- a/nxcomp/Alpha.h
+++ b/nxcomp/src/Alpha.h
diff --git a/nxcomp/Auth.cpp b/nxcomp/src/Auth.cpp
index bc047aa30..d42c0556d 100644
--- a/nxcomp/Auth.cpp
+++ b/nxcomp/src/Auth.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Auth.h"
#include "Misc.h"
diff --git a/nxcomp/Auth.h b/nxcomp/src/Auth.h
index d51d9a26f..d51d9a26f 100644
--- a/nxcomp/Auth.h
+++ b/nxcomp/src/Auth.h
diff --git a/nxcomp/Bitmap.cpp b/nxcomp/src/Bitmap.cpp
index fbc34a55e..c89df53e3 100644
--- a/nxcomp/Bitmap.cpp
+++ b/nxcomp/src/Bitmap.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Bitmap.h"
diff --git a/nxcomp/Bitmap.h b/nxcomp/src/Bitmap.h
index 8143e3125..8143e3125 100644
--- a/nxcomp/Bitmap.h
+++ b/nxcomp/src/Bitmap.h
diff --git a/nxcomp/BlockCache.cpp b/nxcomp/src/BlockCache.cpp
index 76f7fd797..161145e3d 100644
--- a/nxcomp/BlockCache.cpp
+++ b/nxcomp/src/BlockCache.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <string.h>
#include "BlockCache.h"
diff --git a/nxcomp/BlockCache.h b/nxcomp/src/BlockCache.h
index 48e586966..48e586966 100644
--- a/nxcomp/BlockCache.h
+++ b/nxcomp/src/BlockCache.h
diff --git a/nxcomp/BlockCacheSet.cpp b/nxcomp/src/BlockCacheSet.cpp
index 3fd5e1ac7..1dd6361dc 100644
--- a/nxcomp/BlockCacheSet.cpp
+++ b/nxcomp/src/BlockCacheSet.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "BlockCacheSet.h"
diff --git a/nxcomp/BlockCacheSet.h b/nxcomp/src/BlockCacheSet.h
index 97273b0e0..97273b0e0 100644
--- a/nxcomp/BlockCacheSet.h
+++ b/nxcomp/src/BlockCacheSet.h
diff --git a/nxcomp/ChangeGC.cpp b/nxcomp/src/ChangeGC.cpp
index f06984a10..e92178f27 100644
--- a/nxcomp/ChangeGC.cpp
+++ b/nxcomp/src/ChangeGC.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ChangeGC.h"
#include "ClientCache.h"
diff --git a/nxcomp/ChangeGC.h b/nxcomp/src/ChangeGC.h
index 9cac90e66..9cac90e66 100644
--- a/nxcomp/ChangeGC.h
+++ b/nxcomp/src/ChangeGC.h
diff --git a/nxcomp/ChangeProperty.cpp b/nxcomp/src/ChangeProperty.cpp
index dbfb8f5d7..74814c2ea 100644
--- a/nxcomp/ChangeProperty.cpp
+++ b/nxcomp/src/ChangeProperty.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ChangeProperty.h"
#include "ClientCache.h"
diff --git a/nxcomp/ChangeProperty.h b/nxcomp/src/ChangeProperty.h
index c06ce10fc..c06ce10fc 100644
--- a/nxcomp/ChangeProperty.h
+++ b/nxcomp/src/ChangeProperty.h
diff --git a/nxcomp/Channel.cpp b/nxcomp/src/Channel.cpp
index 41a09e951..24a422e37 100644
--- a/nxcomp/Channel.cpp
+++ b/nxcomp/src/Channel.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Channel.h"
#include "List.h"
diff --git a/nxcomp/Channel.h b/nxcomp/src/Channel.h
index 93b022630..7e432416a 100644
--- a/nxcomp/Channel.h
+++ b/nxcomp/src/Channel.h
@@ -519,7 +519,7 @@ class Channel
// Set up the split stores.
//
- void handleSplitStoreError(int resource);
+ void handleSplitStoreError(int resource) __attribute__((noreturn));
void handleSplitStoreAlloc(List *list, int resource);
void handleSplitStoreRemove(List *list, int resource);
diff --git a/nxcomp/ChannelCache.cpp b/nxcomp/src/ChannelCache.cpp
index 5c4c360b9..f30f18bc1 100644
--- a/nxcomp/ChannelCache.cpp
+++ b/nxcomp/src/ChannelCache.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ChannelCache.h"
const unsigned int CONFIGUREWINDOW_FIELD_WIDTH[7] =
diff --git a/nxcomp/ChannelCache.h b/nxcomp/src/ChannelCache.h
index 6a29c3847..6a29c3847 100644
--- a/nxcomp/ChannelCache.h
+++ b/nxcomp/src/ChannelCache.h
diff --git a/nxcomp/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp
index 286210dc7..921615bae 100644
--- a/nxcomp/ChannelEndPoint.cpp
+++ b/nxcomp/src/ChannelEndPoint.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
diff --git a/nxcomp/ChannelEndPoint.h b/nxcomp/src/ChannelEndPoint.h
index 4c0c728f3..4c0c728f3 100644
--- a/nxcomp/ChannelEndPoint.h
+++ b/nxcomp/src/ChannelEndPoint.h
diff --git a/nxcomp/ChannelStore.h b/nxcomp/src/ChannelStore.h
index 53bb60f73..53bb60f73 100644
--- a/nxcomp/ChannelStore.h
+++ b/nxcomp/src/ChannelStore.h
diff --git a/nxcomp/CharCache.cpp b/nxcomp/src/CharCache.cpp
index 88e66e3da..ed0e5a02a 100644
--- a/nxcomp/CharCache.cpp
+++ b/nxcomp/src/CharCache.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "CharCache.h"
int CharCache::lookup(unsigned char value, unsigned int &index)
diff --git a/nxcomp/CharCache.h b/nxcomp/src/CharCache.h
index b8891d2df..b8891d2df 100644
--- a/nxcomp/CharCache.h
+++ b/nxcomp/src/CharCache.h
diff --git a/nxcomp/Children.cpp b/nxcomp/src/Children.cpp
index 265ba4e37..e77d1defd 100644
--- a/nxcomp/Children.cpp
+++ b/nxcomp/src/Children.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <unistd.h>
#include <sys/types.h>
#include <signal.h>
@@ -60,7 +64,7 @@
extern Keeper *keeper;
-extern int (*handler)(int);
+extern int (*signalHandler)(int);
extern int useUnixSocket;
@@ -788,7 +792,7 @@ int NXTransKeeper(int caches, int images, const char *root)
keeper = new Keeper(caches, images, root, 100, parent);
- handler = NXTransKeeperHandler;
+ signalHandler = NXTransKeeperHandler;
if (keeper == NULL)
{
diff --git a/nxcomp/ClearArea.cpp b/nxcomp/src/ClearArea.cpp
index b76e750a4..0cb152d95 100644
--- a/nxcomp/ClearArea.cpp
+++ b/nxcomp/src/ClearArea.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ClearArea.h"
#include "ClientCache.h"
diff --git a/nxcomp/ClearArea.h b/nxcomp/src/ClearArea.h
index 8067edffd..8067edffd 100644
--- a/nxcomp/ClearArea.h
+++ b/nxcomp/src/ClearArea.h
diff --git a/nxcomp/ClientCache.cpp b/nxcomp/src/ClientCache.cpp
index b6c04dd0b..47bb7db1d 100644
--- a/nxcomp/ClientCache.cpp
+++ b/nxcomp/src/ClientCache.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ClientCache.h"
ClientCache::ClientCache() :
diff --git a/nxcomp/ClientCache.h b/nxcomp/src/ClientCache.h
index ed3361097..ed3361097 100644
--- a/nxcomp/ClientCache.h
+++ b/nxcomp/src/ClientCache.h
diff --git a/nxcomp/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp
index dbf5f6986..f01ad6d7b 100644
--- a/nxcomp/ClientChannel.cpp
+++ b/nxcomp/src/ClientChannel.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <string.h>
#include <X11/X.h>
@@ -693,10 +697,10 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
*(clientCache_ -> convertSelectionAtomCache[i]), 9);
nextSrc += 4;
}
- unsigned int timestamp = GetULONG(nextSrc, bigEndian_);
- encodeBuffer.encodeValue(timestamp -
+ unsigned int _timestamp = GetULONG(nextSrc, bigEndian_);
+ encodeBuffer.encodeValue(_timestamp -
clientCache_ -> convertSelectionLastTimestamp, 32, 4);
- clientCache_ -> convertSelectionLastTimestamp = timestamp;
+ clientCache_ -> convertSelectionLastTimestamp = _timestamp;
}
break;
case X_CopyArea:
@@ -1368,10 +1372,10 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 16,
bigEndian_), 29, clientCache_ -> cursorCache, 9);
- unsigned int timestamp = GetULONG(inputMessage + 20, bigEndian_);
- encodeBuffer.encodeValue(timestamp -
+ unsigned int _timestamp = GetULONG(inputMessage + 20, bigEndian_);
+ encodeBuffer.encodeValue(_timestamp -
clientCache_ -> grabKeyboardLastTimestamp, 32, 4);
- clientCache_ -> grabKeyboardLastTimestamp = timestamp;
+ clientCache_ -> grabKeyboardLastTimestamp = _timestamp;
sequenceQueue_.push(clientSequence_, inputOpcode);
@@ -1383,10 +1387,10 @@ int ClientChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
encodeBuffer.encodeBoolValue((unsigned int) inputMessage[1]);
encodeBuffer.encodeXidValue(GetULONG(inputMessage + 4, bigEndian_),
clientCache_ -> windowCache);
- unsigned int timestamp = GetULONG(inputMessage + 8, bigEndian_);
- encodeBuffer.encodeValue(timestamp -
+ unsigned int _timestamp = GetULONG(inputMessage + 8, bigEndian_);
+ encodeBuffer.encodeValue(_timestamp -
clientCache_ -> grabKeyboardLastTimestamp, 32, 4);
- clientCache_ -> grabKeyboardLastTimestamp = timestamp;
+ clientCache_ -> grabKeyboardLastTimestamp = _timestamp;
encodeBuffer.encodeBoolValue((unsigned int) inputMessage[12]);
encodeBuffer.encodeBoolValue((unsigned int) inputMessage[13]);
@@ -3603,10 +3607,10 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
unsigned char *nextDest = outputMessage + 32;
for (; numExtensions; numExtensions--)
{
- unsigned int length;
- decodeBuffer.decodeValue(length, 8);
- *nextDest++ = (unsigned char) length;
- for (; length; length--)
+ unsigned int _length;
+ decodeBuffer.decodeValue(_length, 8);
+ *nextDest++ = (unsigned char) _length;
+ for (; _length; _length--)
{
decodeBuffer.decodeValue(value, 8);
*nextDest++ = value;
@@ -3651,13 +3655,13 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
unsigned char* nextDest = outputMessage + 32;
for (; numFonts; numFonts--)
{
- unsigned int length;
- decodeBuffer.decodeValue(length, 8);
- *nextDest++ = (unsigned char)length;
+ unsigned int _length;
+ decodeBuffer.decodeValue(_length, 8);
+ *nextDest++ = (unsigned char)_length;
// Since ProtoStep7 (#issue 108)
- decodeBuffer.decodeTextData(nextDest, length);
- nextDest += length;
+ decodeBuffer.decodeTextData(nextDest, _length);
+ nextDest += _length;
}
handleSave(messageStore, outputMessage, outputLength);
@@ -3900,10 +3904,10 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
{
unsigned int index;
decodeBuffer.decodeValue(index, 4);
- unsigned int length;
+ unsigned int _length;
const unsigned char *data;
- ServerCache::queryFontFontCache.get(index, length, data);
- memcpy(nextDest, data, length);
+ ServerCache::queryFontFontCache.get(index, _length, data);
+ memcpy(nextDest, data, _length);
end = 1;
}
@@ -3911,7 +3915,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
if (end == 0)
{
unsigned char *saveDest = nextDest;
- unsigned int length = numProperties * 8 + numCharInfos * 12;
+ unsigned int _length = numProperties * 8 + numCharInfos * 12;
for (; numProperties; numProperties--)
{
decodeBuffer.decodeValue(value, 32, 9);
@@ -3926,7 +3930,7 @@ int ClientChannel::handleWrite(const unsigned char *message, unsigned int length
nextDest += 12;
}
- ServerCache::queryFontFontCache.set(length, saveDest);
+ ServerCache::queryFontFontCache.set(_length, saveDest);
}
handleSave(messageStore, outputMessage, outputLength);
@@ -7841,12 +7845,12 @@ void ClientChannel::handleDecodeCharInfo(DecodeBuffer &decodeBuffer, unsigned ch
for (unsigned int i = 1; i < 5; i++)
{
- unsigned int value;
+ unsigned int _value;
- decodeBuffer.decodeCachedValue(value, 16,
+ decodeBuffer.decodeCachedValue(_value, 16,
*serverCache_ -> queryFontCharInfoCache[i], 6);
- PutUINT(value, nextDest, bigEndian_);
+ PutUINT(_value, nextDest, bigEndian_);
nextDest += 2;
}
diff --git a/nxcomp/ClientChannel.h b/nxcomp/src/ClientChannel.h
index ae92648d5..ae92648d5 100644
--- a/nxcomp/ClientChannel.h
+++ b/nxcomp/src/ClientChannel.h
diff --git a/nxcomp/ClientProxy.cpp b/nxcomp/src/ClientProxy.cpp
index 3df45331a..3574d3bf3 100644
--- a/nxcomp/ClientProxy.cpp
+++ b/nxcomp/src/ClientProxy.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Socket.h"
#include "Agent.h"
diff --git a/nxcomp/ClientProxy.h b/nxcomp/src/ClientProxy.h
index b89785b1a..b89785b1a 100644
--- a/nxcomp/ClientProxy.h
+++ b/nxcomp/src/ClientProxy.h
diff --git a/nxcomp/ClientReadBuffer.cpp b/nxcomp/src/ClientReadBuffer.cpp
index 37502038f..c8f4f69a4 100644
--- a/nxcomp/ClientReadBuffer.cpp
+++ b/nxcomp/src/ClientReadBuffer.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ClientReadBuffer.h"
#include "ClientChannel.h"
diff --git a/nxcomp/ClientReadBuffer.h b/nxcomp/src/ClientReadBuffer.h
index c557417fa..c557417fa 100644
--- a/nxcomp/ClientReadBuffer.h
+++ b/nxcomp/src/ClientReadBuffer.h
diff --git a/nxcomp/ClientStore.cpp b/nxcomp/src/ClientStore.cpp
index e1ba3f4a7..0c12eefd8 100644
--- a/nxcomp/ClientStore.cpp
+++ b/nxcomp/src/ClientStore.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ClientStore.h"
//
diff --git a/nxcomp/ClientStore.h b/nxcomp/src/ClientStore.h
index 009d87d9f..009d87d9f 100644
--- a/nxcomp/ClientStore.h
+++ b/nxcomp/src/ClientStore.h
diff --git a/nxcomp/Colormap.cpp b/nxcomp/src/Colormap.cpp
index 8579b7317..afe99ecae 100644
--- a/nxcomp/Colormap.cpp
+++ b/nxcomp/src/Colormap.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Unpack.h"
#include "Colormap.h"
diff --git a/nxcomp/Colormap.h b/nxcomp/src/Colormap.h
index a96d003fa..a96d003fa 100644
--- a/nxcomp/Colormap.h
+++ b/nxcomp/src/Colormap.h
diff --git a/nxcomp/ConfigureWindow.cpp b/nxcomp/src/ConfigureWindow.cpp
index 7b0794269..32d3153b9 100644
--- a/nxcomp/ConfigureWindow.cpp
+++ b/nxcomp/src/ConfigureWindow.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ConfigureWindow.h"
#include "ClientCache.h"
diff --git a/nxcomp/ConfigureWindow.h b/nxcomp/src/ConfigureWindow.h
index e02c2aae1..e02c2aae1 100644
--- a/nxcomp/ConfigureWindow.h
+++ b/nxcomp/src/ConfigureWindow.h
diff --git a/nxcomp/Control.cpp b/nxcomp/src/Control.cpp
index 4469a9bf5..75fd56e3f 100644
--- a/nxcomp/Control.cpp
+++ b/nxcomp/src/Control.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "NX.h"
#include "NXpack.h"
diff --git a/nxcomp/Control.h b/nxcomp/src/Control.h
index 764fca2c1..764fca2c1 100644
--- a/nxcomp/Control.h
+++ b/nxcomp/src/Control.h
diff --git a/nxcomp/CopyArea.cpp b/nxcomp/src/CopyArea.cpp
index 3bff8d60e..c2a19c2df 100644
--- a/nxcomp/CopyArea.cpp
+++ b/nxcomp/src/CopyArea.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "CopyArea.h"
#include "ClientCache.h"
diff --git a/nxcomp/CopyArea.h b/nxcomp/src/CopyArea.h
index 6b2617875..6b2617875 100644
--- a/nxcomp/CopyArea.h
+++ b/nxcomp/src/CopyArea.h
diff --git a/nxcomp/CreateGC.cpp b/nxcomp/src/CreateGC.cpp
index 30a2f674e..34978de13 100644
--- a/nxcomp/CreateGC.cpp
+++ b/nxcomp/src/CreateGC.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "CreateGC.h"
#include "ClientCache.h"
diff --git a/nxcomp/CreateGC.h b/nxcomp/src/CreateGC.h
index 03e27d685..03e27d685 100644
--- a/nxcomp/CreateGC.h
+++ b/nxcomp/src/CreateGC.h
diff --git a/nxcomp/CreatePixmap.cpp b/nxcomp/src/CreatePixmap.cpp
index 93ca38fbb..a60134cd5 100644
--- a/nxcomp/CreatePixmap.cpp
+++ b/nxcomp/src/CreatePixmap.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "CreatePixmap.h"
#include "ClientCache.h"
diff --git a/nxcomp/CreatePixmap.h b/nxcomp/src/CreatePixmap.h
index 0a3212dd9..0a3212dd9 100644
--- a/nxcomp/CreatePixmap.h
+++ b/nxcomp/src/CreatePixmap.h
diff --git a/nxcomp/DecodeBuffer.cpp b/nxcomp/src/DecodeBuffer.cpp
index 456dee249..4c1530d9b 100644
--- a/nxcomp/DecodeBuffer.cpp
+++ b/nxcomp/src/DecodeBuffer.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Control.h"
diff --git a/nxcomp/DecodeBuffer.h b/nxcomp/src/DecodeBuffer.h
index f5f84c54f..f5f84c54f 100644
--- a/nxcomp/DecodeBuffer.h
+++ b/nxcomp/src/DecodeBuffer.h
diff --git a/nxcomp/EncodeBuffer.cpp b/nxcomp/src/EncodeBuffer.cpp
index a259aacb2..e112113a8 100644
--- a/nxcomp/EncodeBuffer.cpp
+++ b/nxcomp/src/EncodeBuffer.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Control.h"
diff --git a/nxcomp/EncodeBuffer.h b/nxcomp/src/EncodeBuffer.h
index 67f6ff093..67f6ff093 100644
--- a/nxcomp/EncodeBuffer.h
+++ b/nxcomp/src/EncodeBuffer.h
diff --git a/nxcomp/FillPoly.cpp b/nxcomp/src/FillPoly.cpp
index 85fa8fdd1..b5928d5cf 100644
--- a/nxcomp/FillPoly.cpp
+++ b/nxcomp/src/FillPoly.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "FillPoly.h"
#include "ClientCache.h"
diff --git a/nxcomp/FillPoly.h b/nxcomp/src/FillPoly.h
index 4ceb96c09..4ceb96c09 100644
--- a/nxcomp/FillPoly.h
+++ b/nxcomp/src/FillPoly.h
diff --git a/nxcomp/Fork.cpp b/nxcomp/src/Fork.cpp
index 0120cb4a6..657c36134 100644
--- a/nxcomp/Fork.cpp
+++ b/nxcomp/src/Fork.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <unistd.h>
#include "Fork.h"
diff --git a/nxcomp/Fork.h b/nxcomp/src/Fork.h
index 94238ed90..94238ed90 100644
--- a/nxcomp/Fork.h
+++ b/nxcomp/src/Fork.h
diff --git a/nxcomp/FreeCache.h b/nxcomp/src/FreeCache.h
index bf5c801e5..bf5c801e5 100644
--- a/nxcomp/FreeCache.h
+++ b/nxcomp/src/FreeCache.h
diff --git a/nxcomp/GenericChannel.cpp b/nxcomp/src/GenericChannel.cpp
index 6fc049e70..877412cee 100644
--- a/nxcomp/GenericChannel.cpp
+++ b/nxcomp/src/GenericChannel.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/nxcomp/GenericChannel.h b/nxcomp/src/GenericChannel.h
index 3df18f444..3df18f444 100644
--- a/nxcomp/GenericChannel.h
+++ b/nxcomp/src/GenericChannel.h
diff --git a/nxcomp/GenericReadBuffer.cpp b/nxcomp/src/GenericReadBuffer.cpp
index 337ae2f61..78217157e 100644
--- a/nxcomp/GenericReadBuffer.cpp
+++ b/nxcomp/src/GenericReadBuffer.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "GenericReadBuffer.h"
#include "GenericChannel.h"
diff --git a/nxcomp/GenericReadBuffer.h b/nxcomp/src/GenericReadBuffer.h
index 5ea4d939d..5ea4d939d 100644
--- a/nxcomp/GenericReadBuffer.h
+++ b/nxcomp/src/GenericReadBuffer.h
diff --git a/nxcomp/GenericReply.cpp b/nxcomp/src/GenericReply.cpp
index 3d9a0d638..b56e579e8 100644
--- a/nxcomp/GenericReply.cpp
+++ b/nxcomp/src/GenericReply.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "GenericReply.h"
#include "ServerCache.h"
diff --git a/nxcomp/GenericReply.h b/nxcomp/src/GenericReply.h
index e899b8467..e899b8467 100644
--- a/nxcomp/GenericReply.h
+++ b/nxcomp/src/GenericReply.h
diff --git a/nxcomp/GenericRequest.cpp b/nxcomp/src/GenericRequest.cpp
index 5c342fcf7..c569d6a24 100644
--- a/nxcomp/GenericRequest.cpp
+++ b/nxcomp/src/GenericRequest.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "GenericRequest.h"
#include "ClientCache.h"
diff --git a/nxcomp/GenericRequest.h b/nxcomp/src/GenericRequest.h
index 13ffea718..13ffea718 100644
--- a/nxcomp/GenericRequest.h
+++ b/nxcomp/src/GenericRequest.h
diff --git a/nxcomp/GetImage.cpp b/nxcomp/src/GetImage.cpp
index f6481b61c..20b6a07d1 100644
--- a/nxcomp/GetImage.cpp
+++ b/nxcomp/src/GetImage.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "GetImage.h"
#include "ClientCache.h"
diff --git a/nxcomp/GetImage.h b/nxcomp/src/GetImage.h
index 1c3558d14..1c3558d14 100644
--- a/nxcomp/GetImage.h
+++ b/nxcomp/src/GetImage.h
diff --git a/nxcomp/GetImageReply.cpp b/nxcomp/src/GetImageReply.cpp
index 9b99d38e7..5100804ab 100644
--- a/nxcomp/GetImageReply.cpp
+++ b/nxcomp/src/GetImageReply.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "GetImageReply.h"
#include "ServerCache.h"
diff --git a/nxcomp/GetImageReply.h b/nxcomp/src/GetImageReply.h
index d4f7c4267..d4f7c4267 100644
--- a/nxcomp/GetImageReply.h
+++ b/nxcomp/src/GetImageReply.h
diff --git a/nxcomp/GetProperty.cpp b/nxcomp/src/GetProperty.cpp
index a79ebd64a..1c5e77ccc 100644
--- a/nxcomp/GetProperty.cpp
+++ b/nxcomp/src/GetProperty.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "GetProperty.h"
#include "ClientCache.h"
diff --git a/nxcomp/GetProperty.h b/nxcomp/src/GetProperty.h
index 46727280b..46727280b 100644
--- a/nxcomp/GetProperty.h
+++ b/nxcomp/src/GetProperty.h
diff --git a/nxcomp/GetPropertyReply.cpp b/nxcomp/src/GetPropertyReply.cpp
index 2d0657a4a..bf6879c5f 100644
--- a/nxcomp/GetPropertyReply.cpp
+++ b/nxcomp/src/GetPropertyReply.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "GetPropertyReply.h"
#include "ServerCache.h"
diff --git a/nxcomp/GetPropertyReply.h b/nxcomp/src/GetPropertyReply.h
index 01634b408..01634b408 100644
--- a/nxcomp/GetPropertyReply.h
+++ b/nxcomp/src/GetPropertyReply.h
diff --git a/nxcomp/ImageText16.cpp b/nxcomp/src/ImageText16.cpp
index f3315d4ba..af057635f 100644
--- a/nxcomp/ImageText16.cpp
+++ b/nxcomp/src/ImageText16.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ImageText16.h"
#include "ClientCache.h"
diff --git a/nxcomp/ImageText16.h b/nxcomp/src/ImageText16.h
index 98462ab35..98462ab35 100644
--- a/nxcomp/ImageText16.h
+++ b/nxcomp/src/ImageText16.h
diff --git a/nxcomp/ImageText8.cpp b/nxcomp/src/ImageText8.cpp
index b0d6ac44e..61fcef825 100644
--- a/nxcomp/ImageText8.cpp
+++ b/nxcomp/src/ImageText8.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ImageText8.h"
#include "ClientCache.h"
diff --git a/nxcomp/ImageText8.h b/nxcomp/src/ImageText8.h
index aa9ccb5d9..aa9ccb5d9 100644
--- a/nxcomp/ImageText8.h
+++ b/nxcomp/src/ImageText8.h
diff --git a/nxcomp/IntCache.cpp b/nxcomp/src/IntCache.cpp
index 362412182..c72b81200 100644
--- a/nxcomp/IntCache.cpp
+++ b/nxcomp/src/IntCache.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <string.h>
#include "Misc.h"
diff --git a/nxcomp/IntCache.h b/nxcomp/src/IntCache.h
index 69c522325..69c522325 100644
--- a/nxcomp/IntCache.h
+++ b/nxcomp/src/IntCache.h
diff --git a/nxcomp/InternAtom.cpp b/nxcomp/src/InternAtom.cpp
index 760d72222..9d0ab1b6d 100644
--- a/nxcomp/InternAtom.cpp
+++ b/nxcomp/src/InternAtom.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "InternAtom.h"
#include "ClientCache.h"
diff --git a/nxcomp/InternAtom.h b/nxcomp/src/InternAtom.h
index 6e69eca24..6e69eca24 100644
--- a/nxcomp/InternAtom.h
+++ b/nxcomp/src/InternAtom.h
diff --git a/nxcomp/Jpeg.cpp b/nxcomp/src/Jpeg.cpp
index 54fa71d21..2e8044049 100644
--- a/nxcomp/Jpeg.cpp
+++ b/nxcomp/src/Jpeg.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <X11/Xmd.h>
#ifdef ANDROID
@@ -102,7 +106,7 @@ static int DecompressJpeg24(unsigned char *compressedData, int compressedLen,
static int DecompressJpeg32(unsigned char *compressedData, int compressedLen,
unsigned int w, unsigned int h, unsigned char *dstBuf, int byteOrder);
-void UnpackJpegErrorHandler(j_common_ptr cinfo);
+void UnpackJpegErrorHandler(j_common_ptr cinfo) __attribute__((noreturn));
//
// Colormap stuff.
diff --git a/nxcomp/Jpeg.h b/nxcomp/src/Jpeg.h
index 58a5bffef..58a5bffef 100644
--- a/nxcomp/Jpeg.h
+++ b/nxcomp/src/Jpeg.h
diff --git a/nxcomp/Keeper.cpp b/nxcomp/src/Keeper.cpp
index 7e8cd0cd7..4babbe8a6 100644
--- a/nxcomp/Keeper.cpp
+++ b/nxcomp/src/Keeper.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/nxcomp/Keeper.h b/nxcomp/src/Keeper.h
index b440beceb..b440beceb 100644
--- a/nxcomp/Keeper.h
+++ b/nxcomp/src/Keeper.h
diff --git a/nxcomp/List.cpp b/nxcomp/src/List.cpp
index 228f83214..b2db7151c 100644
--- a/nxcomp/List.cpp
+++ b/nxcomp/src/List.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "List.h"
//
diff --git a/nxcomp/List.h b/nxcomp/src/List.h
index 31c80f835..31c80f835 100644
--- a/nxcomp/List.h
+++ b/nxcomp/src/List.h
diff --git a/nxcomp/ListFontsReply.cpp b/nxcomp/src/ListFontsReply.cpp
index 827f68a09..16be522a1 100644
--- a/nxcomp/ListFontsReply.cpp
+++ b/nxcomp/src/ListFontsReply.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ListFontsReply.h"
#include "ServerCache.h"
diff --git a/nxcomp/ListFontsReply.h b/nxcomp/src/ListFontsReply.h
index c731878e0..c731878e0 100644
--- a/nxcomp/ListFontsReply.h
+++ b/nxcomp/src/ListFontsReply.h
diff --git a/nxcomp/Loop.cpp b/nxcomp/src/Loop.cpp
index 4592121de..b6c82a2b4 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -327,14 +331,12 @@ Keeper *keeper = NULL;
// to be notified about signals.
//
-int (*handler)(int) = NULL;
+int (*signalHandler)(int) = NULL;
//
-// Signal handling functions.
+// Signal handling functions (that are not already mentioned in Misc.h).
//
-void DisableSignals();
-void EnableSignals();
void InstallSignals();
static void RestoreSignals();
@@ -360,12 +362,9 @@ void RegisterChild(int child);
static int CheckAbort();
//
-// Timer handling utilities.
+// Timer handling utilities (that are not already mentioned in Misc.h).
//
-void SetTimer(int timeout);
-void ResetTimer();
-
static void HandleTimer(int signal);
//
@@ -428,8 +427,8 @@ static int SetupAgentInstance();
static int SetupTcpSocket();
static int SetupUnixSocket();
static int SetupServiceSockets();
-static int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
- unsigned int &xServerAddrLength);
+static int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
+ unsigned int &addr_length);
//
// Setup a listening socket and accept
@@ -446,8 +445,8 @@ static int AcceptConnection(int fd, int domain, const char *label);
// Other convenience functions.
//
-static int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason);
-static int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason);
+static int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFileDescriptor, int* reason);
+static int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFileDescriptor, int* reason);
static int WaitForRemote(ChannelEndPoint &socketAddress);
static int ConnectToRemote(ChannelEndPoint &socketAddress);
@@ -712,7 +711,7 @@ static inline void handleTerminatedInLoop();
// Monitor the size of the log file.
//
-static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs);
+static void handleLogReopenInLoop(T_timestamp &lTs, T_timestamp &nTs);
//
// Directory where the NX binaries and libraries reside.
@@ -1024,8 +1023,6 @@ T_timestamp startTs;
T_timestamp logsTs;
T_timestamp nowTs;
-int diffTs;
-
//
// This is set to the main proxy process id.
//
@@ -2768,7 +2765,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
nowTs = getNewTimestamp();
- diffTs = diffTimestamp(startTs, nowTs);
+ int diffTs = diffTimestamp(startTs, nowTs);
#ifdef TEST
*logofs << "Loop: Mark - 0 - at " << strMsTimestamp()
@@ -2808,6 +2805,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet,
int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet,
fd_set *writeSet, struct timeval *selectTs)
{
+ int diffTs;
#ifdef TIME
static T_timestamp lastTs;
@@ -4026,12 +4024,12 @@ int SetupUnixSocket()
// implementation.
//
-int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
- unsigned int &xServerAddrLength)
+int SetupDisplaySocket(int &addr_family, sockaddr *&addr,
+ unsigned int &addr_length)
{
- xServerAddrFamily = AF_INET;
- xServerAddr = NULL;
- xServerAddrLength = 0;
+ addr_family = AF_INET;
+ addr = NULL;
+ addr_length = 0;
char *display;
@@ -4168,7 +4166,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
sockaddr_un *xServerAddrUNIX = new sockaddr_un;
- xServerAddrFamily = AF_UNIX;
+ addr_family = AF_UNIX;
xServerAddrUNIX -> sun_family = AF_UNIX;
//
@@ -4190,25 +4188,25 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
#ifdef __linux__
int testSocketFD;
- testSocketFD = socket(xServerAddrFamily, SOCK_STREAM, PF_UNSPEC);
+ testSocketFD = socket(addr_family, SOCK_STREAM, PF_UNSPEC);
int len = sprintf(unixSocketName + 1, "/tmp/.X11-unix/X%d", xPort);
unixSocketName[0] = '\0';
sockaddr_un *xServerAddrABSTRACT = new sockaddr_un;
- memset(xServerAddrABSTRACT, 0, xServerAddrLength);
+ memset(xServerAddrABSTRACT, 0, addr_length);
xServerAddrABSTRACT -> sun_family = AF_UNIX;
memcpy(xServerAddrABSTRACT -> sun_path, unixSocketName, len+1);
- xServerAddrLength = len +3;
+ addr_length = len +3;
- int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, xServerAddrLength);
+ int ret = connect(testSocketFD, (struct sockaddr *) xServerAddrABSTRACT, addr_length);
if (ret == 0) {
cerr << "Info" << ": Using abstract X11 socket in kernel namespace "
<< "for accessing DISPLAY=:" << xPort << ".\n";
close(testSocketFD);
- xServerAddr = (sockaddr *) xServerAddrABSTRACT;
+ addr = (sockaddr *) xServerAddrABSTRACT;
return 1;
} else {
@@ -4288,8 +4286,8 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
strcpy(xServerAddrUNIX -> sun_path, unixSocketName);
- xServerAddr = (sockaddr *) xServerAddrUNIX;
- xServerAddrLength = sizeof(sockaddr_un);
+ addr = (sockaddr *) xServerAddrUNIX;
+ addr_length = sizeof(sockaddr_un);
#ifdef __linux__
@@ -4307,7 +4305,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
<< logofs_flush;
#endif
- xServerAddrFamily = AF_INET;
+ addr_family = AF_INET;
int xServerIPAddr = GetHostAddress(display);
@@ -4330,8 +4328,8 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
xServerAddrTCP -> sin_port = htons(X_TCP_PORT + xPort);
xServerAddrTCP -> sin_addr.s_addr = xServerIPAddr;
- xServerAddr = (sockaddr *) xServerAddrTCP;
- xServerAddrLength = sizeof(sockaddr_in);
+ addr = (sockaddr *) xServerAddrTCP;
+ addr_length = sizeof(sockaddr_in);
}
delete [] display;
@@ -5521,8 +5519,6 @@ void CleanupLocal()
logsTs = nullTimestamp();
nowTs = nullTimestamp();
- diffTs = 0;
-
lastProxy = 0;
lastDialog = 0;
lastWatchdog = 0;
@@ -6000,7 +5996,7 @@ void HandleSignal(int signal)
#endif
- if (getpid() != lastProxy && handler != NULL)
+ if (getpid() != lastProxy && signalHandler != NULL)
{
#if defined(UNSAFE) && (defined(TEST) || defined(INFO))
*logofs << "Loop: Calling slave handler in process "
@@ -6008,7 +6004,7 @@ void HandleSignal(int signal)
<< logofs_flush;
#endif
- if ((*handler)(signal) == 0)
+ if ((*signalHandler)(signal) == 0)
{
return;
}
@@ -6648,7 +6644,7 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
int retryAccept = -1;
- int proxyFD = -1;
+ int pFD = -1;
int newFD = -1;
int acceptIPAddr = 0;
@@ -6683,10 +6679,10 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
strcpy(hostLabel, "any host");
}
- long bindPort;
- if (socketAddress.getTCPHostAndPort(NULL, &bindPort))
+ long _bindPort;
+ if (socketAddress.getTCPHostAndPort(NULL, &_bindPort))
{
- socketAddress.setSpec(loopbackBind ? "localhost" : "*", bindPort);
+ socketAddress.setSpec(loopbackBind ? "localhost" : "*", _bindPort);
}
else
{
@@ -6700,7 +6696,7 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
strcpy(hostLabel, "unknown origin (something went wrong!!!)");
- proxyFD = ListenConnection(socketAddress, "NX");
+ pFD = ListenConnection(socketAddress, "NX");
socketAddress.getSpec(&socketUri);
#ifdef TEST
@@ -6730,14 +6726,14 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
fd_set readSet;
FD_ZERO(&readSet);
- FD_SET(proxyFD, &readSet);
+ FD_SET(pFD, &readSet);
T_timestamp selectTs;
selectTs.tv_sec = 20;
selectTs.tv_usec = 0;
- int result = select(proxyFD + 1, &readSet, NULL, NULL, &selectTs);
+ int result = select(pFD + 1, &readSet, NULL, NULL, &selectTs);
getNewTimestamp();
@@ -6764,7 +6760,7 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
goto WaitForRemoteError;
}
- else if (result > 0 && FD_ISSET(proxyFD, &readSet))
+ else if (result > 0 && FD_ISSET(pFD, &readSet))
{
sockaddr_in newAddrINET;
@@ -6772,12 +6768,12 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
if (socketAddress.isUnixSocket())
{
socklen_t addrLen = sizeof(sockaddr_un);
- newFD = accept(proxyFD, NULL, &addrLen);
+ newFD = accept(pFD, NULL, &addrLen);
}
else if (socketAddress.isTCPSocket())
{
socklen_t addrLen = sizeof(sockaddr_in);
- newFD = accept(proxyFD, (sockaddr *) &newAddrINET, &addrLen);
+ newFD = accept(pFD, (sockaddr *) &newAddrINET, &addrLen);
}
if (newFD == -1)
{
@@ -6899,29 +6895,29 @@ int WaitForRemote(ChannelEndPoint &socketAddress)
}
}
- close(proxyFD);
+ close(pFD);
return newFD;
WaitForRemoteError:
- close(proxyFD);
+ close(pFD);
HandleCleanup();
}
-int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFD, int* reason)
+int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout, int* proxyFileDescriptor, int* reason)
{
- if (!proxyFD)
+ if (!proxyFileDescriptor)
{
#ifdef PANIC
*logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionTCP). "
- << "'proxyFD' must not be a NULL pointer.\n" << logofs_flush;
+ << "'proxyFileDescriptor' must not be a NULL pointer.\n" << logofs_flush;
#endif
cerr << "Error" << ": Implementation error (PrepareProxyConnectionTCP). "
- << "'proxyFD' must not be a NULL pointer.\n";
+ << "'proxyFileDescriptor' must not be a NULL pointer.\n";
return -1;
}
@@ -6962,7 +6958,7 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
<< *hostName << ":" << *portNum << "'.\n"
<< logofs_flush;
- *proxyFD = -1;
+ *proxyFileDescriptor = -1;
*reason = -1;
sockaddr_in addr;
@@ -6970,10 +6966,10 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
addr.sin_port = htons(*portNum);
addr.sin_addr.s_addr = remoteIPAddr;
- *proxyFD = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
+ *proxyFileDescriptor = socket(AF_INET, SOCK_STREAM, PF_UNSPEC);
*reason = EGET();
- if (*proxyFD == -1)
+ if (*proxyFileDescriptor == -1)
{
#ifdef PANIC
*logofs << "Loop: PANIC! Call to socket failed. "
@@ -6987,7 +6983,7 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
return -1;
}
- else if (SetReuseAddress(*proxyFD) < 0)
+ else if (SetReuseAddress(*proxyFileDescriptor) < 0)
{
return -1;
}
@@ -7002,7 +6998,7 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
else
SetTimer(20000);
- int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_in));
+ int result = connect(*proxyFileDescriptor, (sockaddr *) &addr, sizeof(sockaddr_in));
*reason = EGET();
@@ -7012,18 +7008,18 @@ int PrepareProxyConnectionTCP(char** hostName, long int* portNum, int* timeout,
}
-int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* reason)
+int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFileDescriptor, int* reason)
{
- if (!proxyFD)
+ if (!proxyFileDescriptor)
{
#ifdef PANIC
*logofs << "Loop: PANIC! Implementation error (PrepareProxyConnectionUnix). "
- << "proxyFD must not be a NULL pointer.\n" << logofs_flush;
+ << "proxyFileDescriptor must not be a NULL pointer.\n" << logofs_flush;
#endif
cerr << "Error" << ": Implementation error (PrepareProxyConnectionUnix). "
- << "proxyFD must not be a NULL pointer.\n";
+ << "proxyFileDescriptor must not be a NULL pointer.\n";
return -1;
}
@@ -7043,17 +7039,17 @@ int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* rea
/* FIXME: Add socket file existence and permission checks */
- *proxyFD = -1;
+ *proxyFileDescriptor = -1;
*reason = -1;
sockaddr_un addr;
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, *path, 108 - 1);
- *proxyFD = socket(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
+ *proxyFileDescriptor = socket(AF_UNIX, SOCK_STREAM, PF_UNSPEC);
*reason = EGET();
- if (*proxyFD == -1)
+ if (*proxyFileDescriptor == -1)
{
#ifdef PANIC
*logofs << "Loop: PANIC! Call to socket failed. "
@@ -7078,7 +7074,7 @@ int PrepareProxyConnectionUnix(char** path, int* timeout, int* proxyFD, int* rea
else
SetTimer(20000);
- int result = connect(*proxyFD, (sockaddr *) &addr, sizeof(sockaddr_un));
+ int result = connect(*proxyFileDescriptor, (sockaddr *) &addr, sizeof(sockaddr_un));
*reason = EGET();
@@ -7117,7 +7113,7 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
int result = -1;
int reason = -1;
- int proxyFD = -1;
+ int pFD = -1;
char *hostName = NULL;
long int portNum = -1;
@@ -7134,13 +7130,13 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
#endif
if (socketAddress.getUnixPath(&unixPath))
- result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &proxyFD, &reason);
+ result = PrepareProxyConnectionUnix(&unixPath, &connectTimeout, &pFD, &reason);
else if (socketAddress.getTCPHostAndPort(&hostName, &portNum))
- result = PrepareProxyConnectionTCP(&hostName, &portNum, &connectTimeout, &proxyFD, &reason);
+ result = PrepareProxyConnectionTCP(&hostName, &portNum, &connectTimeout, &pFD, &reason);
if (result < 0)
{
- close(proxyFD);
+ close(pFD);
if (CheckAbort() != 0)
{
@@ -7278,13 +7274,13 @@ int ConnectToRemote(ChannelEndPoint &socketAddress)
}
}
- return proxyFD;
+ return pFD;
ConnectToRemoteError:
- if (proxyFD != -1)
+ if (pFD != -1)
{
- close(proxyFD);
+ close(pFD);
}
HandleCleanup();
@@ -16486,7 +16482,7 @@ static inline void handleEventsInLoop()
}
}
-static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs)
+static void handleLogReopenInLoop(T_timestamp &lTs, T_timestamp &nTs)
{
//
// If need to limit the size of the
@@ -16496,7 +16492,7 @@ static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs)
#ifndef QUOTA
- if (diffTimestamp(logsTs, nowTs) > control -> FileSizeCheckTimeout)
+ if (diffTimestamp(lTs, nTs) > control -> FileSizeCheckTimeout)
#endif
{
@@ -16518,7 +16514,7 @@ static void handleLogReopenInLoop(T_timestamp &logsTs, T_timestamp &nowTs)
// Reset to current timestamp.
//
- logsTs = nowTs;
+ lTs = nTs;
}
}
diff --git a/nxcomp/MD5.c b/nxcomp/src/MD5.c
index e49d3cf58..7255ca5c0 100644
--- a/nxcomp/MD5.c
+++ b/nxcomp/src/MD5.c
@@ -51,6 +51,10 @@
1999-05-03 lpd Original version.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "MD5.h"
#include <string.h>
diff --git a/nxcomp/src/Makefile.am b/nxcomp/src/Makefile.am
new file mode 100644
index 000000000..2264cb347
--- /dev/null
+++ b/nxcomp/src/Makefile.am
@@ -0,0 +1,146 @@
+NULL =
+
+lib_LTLIBRARIES = libXcomp.la
+
+libXcomp_la_SOURCES = \
+ ActionCache.cpp \
+ Agent.cpp \
+ Alpha.cpp \
+ Auth.cpp \
+ Bitmap.cpp \
+ BlockCache.cpp \
+ BlockCacheSet.cpp \
+ ChangeGC.cpp \
+ ChangeProperty.cpp \
+ ChannelCache.cpp \
+ Channel.cpp \
+ ChannelEndPoint.cpp \
+ CharCache.cpp \
+ Children.cpp \
+ ClearArea.cpp \
+ ClientCache.cpp \
+ ClientChannel.cpp \
+ ClientProxy.cpp \
+ ClientReadBuffer.cpp \
+ ClientStore.cpp \
+ Colormap.cpp \
+ ConfigureWindow.cpp \
+ Control.cpp \
+ CopyArea.cpp \
+ CreateGC.cpp \
+ CreatePixmap.cpp \
+ DecodeBuffer.cpp \
+ EncodeBuffer.cpp \
+ FillPoly.cpp \
+ Fork.cpp \
+ GenericChannel.cpp \
+ GenericReadBuffer.cpp \
+ GenericReply.cpp \
+ GenericRequest.cpp \
+ GetImage.cpp \
+ GetImageReply.cpp \
+ GetProperty.cpp \
+ GetPropertyReply.cpp \
+ ImageText16.cpp \
+ ImageText8.cpp \
+ IntCache.cpp \
+ InternAtom.cpp \
+ Jpeg.cpp \
+ Keeper.cpp \
+ List.cpp \
+ ListFontsReply.cpp \
+ Loop.cpp \
+ Message.cpp \
+ MD5.c \
+ Misc.cpp \
+ OpcodeStore.cpp \
+ Pack.c \
+ Pgn.cpp \
+ Pipe.cpp \
+ PolyArc.cpp \
+ PolyFillArc.cpp \
+ PolyFillRectangle.cpp \
+ PolyLine.cpp \
+ PolyPoint.cpp \
+ PolySegment.cpp \
+ PolyText16.cpp \
+ PolyText8.cpp \
+ Proxy.cpp \
+ ProxyReadBuffer.cpp \
+ PutImage.cpp \
+ PutPackedImage.cpp \
+ QueryFontReply.cpp \
+ ReadBuffer.cpp \
+ RenderAddGlyphs.cpp \
+ RenderChangePicture.cpp \
+ RenderComposite.cpp \
+ RenderCompositeGlyphs.cpp \
+ RenderCreateGlyphSet.cpp \
+ RenderCreatePicture.cpp \
+ RenderExtension.cpp \
+ RenderFillRectangles.cpp \
+ RenderFreeGlyphSet.cpp \
+ RenderFreePicture.cpp \
+ RenderGenericRequest.cpp \
+ RenderPictureClip.cpp \
+ RenderPictureFilter.cpp \
+ RenderPictureTransform.cpp \
+ RenderTrapezoids.cpp \
+ RenderTriangles.cpp \
+ Rgb.cpp \
+ Rle.cpp \
+ SendEvent.cpp \
+ SequenceQueue.cpp \
+ ServerCache.cpp \
+ ServerChannel.cpp \
+ ServerProxy.cpp \
+ ServerReadBuffer.cpp \
+ ServerStore.cpp \
+ SetClipRectangles.cpp \
+ SetUnpackAlpha.cpp \
+ SetUnpackColormap.cpp \
+ SetUnpackGeometry.cpp \
+ ShapeExtension.cpp \
+ Socket.cpp \
+ Split.cpp \
+ StaticCompressor.cpp \
+ Statistics.cpp \
+ Timestamp.cpp \
+ TranslateCoords.cpp \
+ Transport.cpp \
+ Unpack.cpp \
+ Vars.c \
+ Version.c \
+ WriteBuffer.cpp \
+ XidCache.cpp \
+ Z.cpp \
+ $(NULL)
+
+libXcomp_la_LIBADD = \
+ @JPEG_LIBS@ \
+ @PNG_LIBS@ \
+ @Z_LIBS@ \
+ $(NULL)
+
+AM_CXXFLAGS = \
+ $(BASE_CXXFLAGS) \
+ $(JPEG_CFLAGS) \
+ $(PNG_CFLAGS) \
+ $(Z_CFLAGS) \
+ $(NULL)
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ $(NULL)
+
+libXcomp_la_LDFLAGS = -version-number @LT_COMP_VERSION@ -no-undefined
+
+libXcompincludedir = $(includedir)/nx
+libXcompinclude_HEADERS = \
+ $(top_srcdir)/include/MD5.h \
+ $(top_srcdir)/include/NX.h \
+ $(top_srcdir)/include/NXalert.h \
+ $(top_srcdir)/include/NXpack.h \
+ $(top_srcdir)/include/NXproto.h \
+ $(top_srcdir)/include/NXvars.h \
+ $(NULL)
diff --git a/nxcomp/Message.cpp b/nxcomp/src/Message.cpp
index 530b6b5a8..b75d90c24 100644
--- a/nxcomp/Message.cpp
+++ b/nxcomp/src/Message.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <cstdio>
#include <unistd.h>
#include <cstring>
diff --git a/nxcomp/Message.h b/nxcomp/src/Message.h
index 30883f101..30883f101 100644
--- a/nxcomp/Message.h
+++ b/nxcomp/src/Message.h
diff --git a/nxcomp/Misc.cpp b/nxcomp/src/Misc.cpp
index 09a0b29d2..b40e6409e 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/src/Misc.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <cstdio>
#include <cctype>
#include <cstdlib>
diff --git a/nxcomp/Misc.h b/nxcomp/src/Misc.h
index 997630137..997630137 100644
--- a/nxcomp/Misc.h
+++ b/nxcomp/src/Misc.h
diff --git a/nxcomp/NXmitshm.h b/nxcomp/src/NXmitshm.h
index 939d488fb..939d488fb 100644
--- a/nxcomp/NXmitshm.h
+++ b/nxcomp/src/NXmitshm.h
diff --git a/nxcomp/NXrender.h b/nxcomp/src/NXrender.h
index 280715833..280715833 100644
--- a/nxcomp/NXrender.h
+++ b/nxcomp/src/NXrender.h
diff --git a/nxcomp/OpcodeCache.h b/nxcomp/src/OpcodeCache.h
index e07a1b997..e07a1b997 100644
--- a/nxcomp/OpcodeCache.h
+++ b/nxcomp/src/OpcodeCache.h
diff --git a/nxcomp/OpcodeStore.cpp b/nxcomp/src/OpcodeStore.cpp
index 66a425d53..21b919c8a 100644
--- a/nxcomp/OpcodeStore.cpp
+++ b/nxcomp/src/OpcodeStore.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "OpcodeStore.h"
OpcodeStore::OpcodeStore()
diff --git a/nxcomp/OpcodeStore.h b/nxcomp/src/OpcodeStore.h
index d041ed4b8..d041ed4b8 100644
--- a/nxcomp/OpcodeStore.h
+++ b/nxcomp/src/OpcodeStore.h
diff --git a/nxcomp/Pack.c b/nxcomp/src/Pack.c
index 97fb93b5f..97fb93b5f 100644
--- a/nxcomp/Pack.c
+++ b/nxcomp/src/Pack.c
diff --git a/nxcomp/Pgn.cpp b/nxcomp/src/Pgn.cpp
index 17e1702d4..649227f52 100644
--- a/nxcomp/Pgn.cpp
+++ b/nxcomp/src/Pgn.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// This file obviously supports PNG
// decompression. It was renamed to
diff --git a/nxcomp/Pgn.h b/nxcomp/src/Pgn.h
index e5ea36715..e5ea36715 100644
--- a/nxcomp/Pgn.h
+++ b/nxcomp/src/Pgn.h
diff --git a/nxcomp/Pipe.cpp b/nxcomp/src/Pipe.cpp
index 88f10edb4..4fa149412 100644
--- a/nxcomp/Pipe.cpp
+++ b/nxcomp/src/Pipe.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/nxcomp/Pipe.h b/nxcomp/src/Pipe.h
index fd1061d30..fd1061d30 100644
--- a/nxcomp/Pipe.h
+++ b/nxcomp/src/Pipe.h
diff --git a/nxcomp/PolyArc.cpp b/nxcomp/src/PolyArc.cpp
index 8996c6f15..42dbb265d 100644
--- a/nxcomp/PolyArc.cpp
+++ b/nxcomp/src/PolyArc.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PolyArc.h"
#include "ClientCache.h"
diff --git a/nxcomp/PolyArc.h b/nxcomp/src/PolyArc.h
index d744d6a10..d744d6a10 100644
--- a/nxcomp/PolyArc.h
+++ b/nxcomp/src/PolyArc.h
diff --git a/nxcomp/PolyFillArc.cpp b/nxcomp/src/PolyFillArc.cpp
index f995a8815..35125f0d3 100644
--- a/nxcomp/PolyFillArc.cpp
+++ b/nxcomp/src/PolyFillArc.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PolyFillArc.h"
#include "ClientCache.h"
diff --git a/nxcomp/PolyFillArc.h b/nxcomp/src/PolyFillArc.h
index a4eff5b48..a4eff5b48 100644
--- a/nxcomp/PolyFillArc.h
+++ b/nxcomp/src/PolyFillArc.h
diff --git a/nxcomp/PolyFillRectangle.cpp b/nxcomp/src/PolyFillRectangle.cpp
index d0f1452b2..95694e582 100644
--- a/nxcomp/PolyFillRectangle.cpp
+++ b/nxcomp/src/PolyFillRectangle.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PolyFillRectangle.h"
#include "ClientCache.h"
diff --git a/nxcomp/PolyFillRectangle.h b/nxcomp/src/PolyFillRectangle.h
index 7ebb9270d..7ebb9270d 100644
--- a/nxcomp/PolyFillRectangle.h
+++ b/nxcomp/src/PolyFillRectangle.h
diff --git a/nxcomp/PolyLine.cpp b/nxcomp/src/PolyLine.cpp
index 845985728..1b12bbe98 100644
--- a/nxcomp/PolyLine.cpp
+++ b/nxcomp/src/PolyLine.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PolyLine.h"
#include "ClientCache.h"
diff --git a/nxcomp/PolyLine.h b/nxcomp/src/PolyLine.h
index 66fa5df1a..66fa5df1a 100644
--- a/nxcomp/PolyLine.h
+++ b/nxcomp/src/PolyLine.h
diff --git a/nxcomp/PolyPoint.cpp b/nxcomp/src/PolyPoint.cpp
index dfd77f40b..70151cc0d 100644
--- a/nxcomp/PolyPoint.cpp
+++ b/nxcomp/src/PolyPoint.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PolyPoint.h"
#include "ClientCache.h"
diff --git a/nxcomp/PolyPoint.h b/nxcomp/src/PolyPoint.h
index b8ea183bf..b8ea183bf 100644
--- a/nxcomp/PolyPoint.h
+++ b/nxcomp/src/PolyPoint.h
diff --git a/nxcomp/PolySegment.cpp b/nxcomp/src/PolySegment.cpp
index 34c2461f1..aa2d4efe3 100644
--- a/nxcomp/PolySegment.cpp
+++ b/nxcomp/src/PolySegment.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PolySegment.h"
#include "ClientCache.h"
diff --git a/nxcomp/PolySegment.h b/nxcomp/src/PolySegment.h
index 53fd42c60..53fd42c60 100644
--- a/nxcomp/PolySegment.h
+++ b/nxcomp/src/PolySegment.h
diff --git a/nxcomp/PolyText16.cpp b/nxcomp/src/PolyText16.cpp
index 80c77a70f..32be45482 100644
--- a/nxcomp/PolyText16.cpp
+++ b/nxcomp/src/PolyText16.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PolyText16.h"
#include "ClientCache.h"
diff --git a/nxcomp/PolyText16.h b/nxcomp/src/PolyText16.h
index 805e1fa04..805e1fa04 100644
--- a/nxcomp/PolyText16.h
+++ b/nxcomp/src/PolyText16.h
diff --git a/nxcomp/PolyText8.cpp b/nxcomp/src/PolyText8.cpp
index 50c21f79e..61fef5a4f 100644
--- a/nxcomp/PolyText8.cpp
+++ b/nxcomp/src/PolyText8.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PolyText8.h"
#include "ClientCache.h"
diff --git a/nxcomp/PolyText8.h b/nxcomp/src/PolyText8.h
index 3d5ff533a..3d5ff533a 100644
--- a/nxcomp/PolyText8.h
+++ b/nxcomp/src/PolyText8.h
diff --git a/nxcomp/Proxy.cpp b/nxcomp/src/Proxy.cpp
index 3a7a42362..5529de021 100644
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/src/Proxy.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <cstdio>
#include <unistd.h>
#include <cstdlib>
@@ -1134,9 +1138,9 @@ int Proxy::handleRead()
// the failure is detected.
//
- int result = channels_[channelId] -> handleWrite(message, dataLength);
+ int _result = channels_[channelId] -> handleWrite(message, dataLength);
- if (result < 0 && finish == 0)
+ if (_result < 0 && finish == 0)
{
#ifdef TEST
*logofs << "Proxy: Failed to write proxy data to FD#"
@@ -5526,7 +5530,7 @@ const char *Proxy::handleLoadAllStores(const char *loadPath, const char *loadNam
md5_append(md5StateStream, (const md5_byte_t *) loadName, strlen(loadName));
md5_finish(md5StateStream, md5DigestStream);
- for (int i = 0; i < MD5_LENGTH; i++)
+ for (unsigned int i = 0; i < MD5_LENGTH; i++)
{
if (md5DigestStream[i] != md5FromFile[i])
{
@@ -5535,17 +5539,17 @@ const char *Proxy::handleLoadAllStores(const char *loadPath, const char *loadNam
*logofs << "Proxy: PANIC! Bad checksum for cache file '"
<< cacheName << "'.\n" << logofs_flush;
- for (unsigned int i = 0; i < MD5_LENGTH; i++)
+ for (unsigned int j = 0; j < MD5_LENGTH; j++)
{
- sprintf(md5String + (i * 2), "%02X", md5FromFile[i]);
+ sprintf(md5String + (j * 2), "%02X", md5FromFile[j]);
}
*logofs << "Proxy: PANIC! Saved checksum is '"
<< md5String << "'.\n" << logofs_flush;
- for (unsigned int i = 0; i < MD5_LENGTH; i++)
+ for (unsigned int j = 0; j < MD5_LENGTH; j++)
{
- sprintf(md5String + (i * 2),"%02X", md5DigestStream[i]);
+ sprintf(md5String + (j * 2),"%02X", md5DigestStream[i]);
}
*logofs << "Proxy: PANIC! Calculated checksum is '"
@@ -5789,14 +5793,14 @@ void Proxy::setSplitTimeout(int channelId)
for (T_list::iterator j = channelList.begin();
j != channelList.end(); j++)
{
- int channelId = *j;
+ int _channelId = *j;
- if (channels_[channelId] != NULL &&
- channels_[channelId] -> needSplit() == 1)
+ if (channels_[_channelId] != NULL &&
+ channels_[_channelId] -> needSplit() == 1)
{
#ifdef TEST
*logofs << "Proxy: SPLIT! Channel for FD#"
- << getFd(channelId) << " still needs splits.\n"
+ << getFd(_channelId) << " still needs splits.\n"
<< logofs_flush;
#endif
@@ -5836,14 +5840,14 @@ void Proxy::setMotionTimeout(int channelId)
for (T_list::iterator j = channelList.begin();
j != channelList.end(); j++)
{
- int channelId = *j;
+ int _channelId = *j;
- if (channels_[channelId] != NULL &&
- channels_[channelId] -> needMotion() == 1)
+ if (channels_[_channelId] != NULL &&
+ channels_[_channelId] -> needMotion() == 1)
{
#ifdef TEST
*logofs << "Proxy: SPLIT! Channel for FD#"
- << getFd(channelId) << " still needs motions.\n"
+ << getFd(_channelId) << " still needs motions.\n"
<< logofs_flush;
#endif
diff --git a/nxcomp/Proxy.h b/nxcomp/src/Proxy.h
index ea60c827a..ea60c827a 100644
--- a/nxcomp/Proxy.h
+++ b/nxcomp/src/Proxy.h
diff --git a/nxcomp/ProxyReadBuffer.cpp b/nxcomp/src/ProxyReadBuffer.cpp
index 0427bb76c..77f12771b 100644
--- a/nxcomp/ProxyReadBuffer.cpp
+++ b/nxcomp/src/ProxyReadBuffer.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ProxyReadBuffer.h"
#include "Transport.h"
diff --git a/nxcomp/ProxyReadBuffer.h b/nxcomp/src/ProxyReadBuffer.h
index 68e9e95fa..68e9e95fa 100644
--- a/nxcomp/ProxyReadBuffer.h
+++ b/nxcomp/src/ProxyReadBuffer.h
diff --git a/nxcomp/PutImage.cpp b/nxcomp/src/PutImage.cpp
index 7b9a3ae5d..d14f922c3 100644
--- a/nxcomp/PutImage.cpp
+++ b/nxcomp/src/PutImage.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PutImage.h"
#include "ClientCache.h"
diff --git a/nxcomp/PutImage.h b/nxcomp/src/PutImage.h
index 93dde9dfb..93dde9dfb 100644
--- a/nxcomp/PutImage.h
+++ b/nxcomp/src/PutImage.h
diff --git a/nxcomp/PutPackedImage.cpp b/nxcomp/src/PutPackedImage.cpp
index 66506ebbe..0bae2c0d4 100644
--- a/nxcomp/PutPackedImage.cpp
+++ b/nxcomp/src/PutPackedImage.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "PutPackedImage.h"
#include "ClientCache.h"
diff --git a/nxcomp/PutPackedImage.h b/nxcomp/src/PutPackedImage.h
index d28ad39eb..d28ad39eb 100644
--- a/nxcomp/PutPackedImage.h
+++ b/nxcomp/src/PutPackedImage.h
diff --git a/nxcomp/QueryFontReply.cpp b/nxcomp/src/QueryFontReply.cpp
index ffd5eaee9..fde873140 100644
--- a/nxcomp/QueryFontReply.cpp
+++ b/nxcomp/src/QueryFontReply.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "QueryFontReply.h"
#include "ServerCache.h"
diff --git a/nxcomp/QueryFontReply.h b/nxcomp/src/QueryFontReply.h
index e12fe4e4b..e12fe4e4b 100644
--- a/nxcomp/QueryFontReply.h
+++ b/nxcomp/src/QueryFontReply.h
diff --git a/nxcomp/ReadBuffer.cpp b/nxcomp/src/ReadBuffer.cpp
index 1e2326cee..154225e75 100644
--- a/nxcomp/ReadBuffer.cpp
+++ b/nxcomp/src/ReadBuffer.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ReadBuffer.h"
#include "Transport.h"
diff --git a/nxcomp/ReadBuffer.h b/nxcomp/src/ReadBuffer.h
index a12bcc9b3..a12bcc9b3 100644
--- a/nxcomp/ReadBuffer.h
+++ b/nxcomp/src/ReadBuffer.h
diff --git a/nxcomp/RenderAddGlyphs.cpp b/nxcomp/src/RenderAddGlyphs.cpp
index ed0864b93..ef13d6890 100644
--- a/nxcomp/RenderAddGlyphs.cpp
+++ b/nxcomp/src/RenderAddGlyphs.cpp
@@ -28,6 +28,10 @@
// this message class.
//
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "RenderAddGlyphs.h"
//
diff --git a/nxcomp/RenderAddGlyphs.h b/nxcomp/src/RenderAddGlyphs.h
index d3c8cd158..d3c8cd158 100644
--- a/nxcomp/RenderAddGlyphs.h
+++ b/nxcomp/src/RenderAddGlyphs.h
diff --git a/nxcomp/RenderChangePicture.cpp b/nxcomp/src/RenderChangePicture.cpp
index 2abb97493..d202b92ad 100644
--- a/nxcomp/RenderChangePicture.cpp
+++ b/nxcomp/src/RenderChangePicture.cpp
@@ -28,6 +28,10 @@
// this message class.
//
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "RenderChangePicture.h"
//
diff --git a/nxcomp/RenderChangePicture.h b/nxcomp/src/RenderChangePicture.h
index 4bab1ef98..4bab1ef98 100644
--- a/nxcomp/RenderChangePicture.h
+++ b/nxcomp/src/RenderChangePicture.h
diff --git a/nxcomp/RenderComposite.cpp b/nxcomp/src/RenderComposite.cpp
index e8603a7da..f82f80f06 100644
--- a/nxcomp/RenderComposite.cpp
+++ b/nxcomp/src/RenderComposite.cpp
@@ -28,6 +28,10 @@
// this message class.
//
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "RenderComposite.h"
//
diff --git a/nxcomp/RenderComposite.h b/nxcomp/src/RenderComposite.h
index aafa1e776..aafa1e776 100644
--- a/nxcomp/RenderComposite.h
+++ b/nxcomp/src/RenderComposite.h
diff --git a/nxcomp/RenderCompositeGlyphs.cpp b/nxcomp/src/RenderCompositeGlyphs.cpp
index 74b3ec779..0949d3e2c 100644
--- a/nxcomp/RenderCompositeGlyphs.cpp
+++ b/nxcomp/src/RenderCompositeGlyphs.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderCompositeGlyphs.h b/nxcomp/src/RenderCompositeGlyphs.h
index 1062ee781..1062ee781 100644
--- a/nxcomp/RenderCompositeGlyphs.h
+++ b/nxcomp/src/RenderCompositeGlyphs.h
diff --git a/nxcomp/RenderCreateGlyphSet.cpp b/nxcomp/src/RenderCreateGlyphSet.cpp
index 3e7a71721..e3a842de9 100644
--- a/nxcomp/RenderCreateGlyphSet.cpp
+++ b/nxcomp/src/RenderCreateGlyphSet.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderCreateGlyphSet.h b/nxcomp/src/RenderCreateGlyphSet.h
index 10f5d6699..10f5d6699 100644
--- a/nxcomp/RenderCreateGlyphSet.h
+++ b/nxcomp/src/RenderCreateGlyphSet.h
diff --git a/nxcomp/RenderCreatePicture.cpp b/nxcomp/src/RenderCreatePicture.cpp
index 2fd736cbb..f3f9f8b8a 100644
--- a/nxcomp/RenderCreatePicture.cpp
+++ b/nxcomp/src/RenderCreatePicture.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderCreatePicture.h b/nxcomp/src/RenderCreatePicture.h
index ae2f583a0..ae2f583a0 100644
--- a/nxcomp/RenderCreatePicture.h
+++ b/nxcomp/src/RenderCreatePicture.h
diff --git a/nxcomp/RenderExtension.cpp b/nxcomp/src/RenderExtension.cpp
index bd2285e82..64761bc05 100644
--- a/nxcomp/RenderExtension.cpp
+++ b/nxcomp/src/RenderExtension.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "NXrender.h"
#include "ClientCache.h"
diff --git a/nxcomp/RenderExtension.h b/nxcomp/src/RenderExtension.h
index aa9db1b55..aa9db1b55 100644
--- a/nxcomp/RenderExtension.h
+++ b/nxcomp/src/RenderExtension.h
diff --git a/nxcomp/RenderFillRectangles.cpp b/nxcomp/src/RenderFillRectangles.cpp
index a6f2c0e0d..db05887ab 100644
--- a/nxcomp/RenderFillRectangles.cpp
+++ b/nxcomp/src/RenderFillRectangles.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderFillRectangles.h b/nxcomp/src/RenderFillRectangles.h
index 9efaeffa8..9efaeffa8 100644
--- a/nxcomp/RenderFillRectangles.h
+++ b/nxcomp/src/RenderFillRectangles.h
diff --git a/nxcomp/RenderFreeGlyphSet.cpp b/nxcomp/src/RenderFreeGlyphSet.cpp
index cf1261ac0..88dfb791a 100644
--- a/nxcomp/RenderFreeGlyphSet.cpp
+++ b/nxcomp/src/RenderFreeGlyphSet.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderFreeGlyphSet.h b/nxcomp/src/RenderFreeGlyphSet.h
index 8817e8d99..8817e8d99 100644
--- a/nxcomp/RenderFreeGlyphSet.h
+++ b/nxcomp/src/RenderFreeGlyphSet.h
diff --git a/nxcomp/RenderFreePicture.cpp b/nxcomp/src/RenderFreePicture.cpp
index 3d468624a..31662a7e2 100644
--- a/nxcomp/RenderFreePicture.cpp
+++ b/nxcomp/src/RenderFreePicture.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderFreePicture.h b/nxcomp/src/RenderFreePicture.h
index b50191a72..b50191a72 100644
--- a/nxcomp/RenderFreePicture.h
+++ b/nxcomp/src/RenderFreePicture.h
diff --git a/nxcomp/RenderGenericRequest.cpp b/nxcomp/src/RenderGenericRequest.cpp
index fc3210ba2..cff34e61e 100644
--- a/nxcomp/RenderGenericRequest.cpp
+++ b/nxcomp/src/RenderGenericRequest.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "NXrender.h"
#include "RenderExtension.h"
diff --git a/nxcomp/RenderGenericRequest.h b/nxcomp/src/RenderGenericRequest.h
index fdf5ca876..fdf5ca876 100644
--- a/nxcomp/RenderGenericRequest.h
+++ b/nxcomp/src/RenderGenericRequest.h
diff --git a/nxcomp/RenderMinorExtensionHeaders.h b/nxcomp/src/RenderMinorExtensionHeaders.h
index b7f6efc5a..b7f6efc5a 100644
--- a/nxcomp/RenderMinorExtensionHeaders.h
+++ b/nxcomp/src/RenderMinorExtensionHeaders.h
diff --git a/nxcomp/RenderMinorExtensionMethods.h b/nxcomp/src/RenderMinorExtensionMethods.h
index d272337e0..d272337e0 100644
--- a/nxcomp/RenderMinorExtensionMethods.h
+++ b/nxcomp/src/RenderMinorExtensionMethods.h
diff --git a/nxcomp/RenderMinorExtensionTags.h b/nxcomp/src/RenderMinorExtensionTags.h
index c24a99638..c24a99638 100644
--- a/nxcomp/RenderMinorExtensionTags.h
+++ b/nxcomp/src/RenderMinorExtensionTags.h
diff --git a/nxcomp/RenderPictureClip.cpp b/nxcomp/src/RenderPictureClip.cpp
index 32d526c81..0d6b505eb 100644
--- a/nxcomp/RenderPictureClip.cpp
+++ b/nxcomp/src/RenderPictureClip.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderPictureClip.h b/nxcomp/src/RenderPictureClip.h
index bd811dfcd..bd811dfcd 100644
--- a/nxcomp/RenderPictureClip.h
+++ b/nxcomp/src/RenderPictureClip.h
diff --git a/nxcomp/RenderPictureFilter.cpp b/nxcomp/src/RenderPictureFilter.cpp
index 9598601c2..ce40e051a 100644
--- a/nxcomp/RenderPictureFilter.cpp
+++ b/nxcomp/src/RenderPictureFilter.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderPictureFilter.h b/nxcomp/src/RenderPictureFilter.h
index a3e37538b..a3e37538b 100644
--- a/nxcomp/RenderPictureFilter.h
+++ b/nxcomp/src/RenderPictureFilter.h
diff --git a/nxcomp/RenderPictureTransform.cpp b/nxcomp/src/RenderPictureTransform.cpp
index 053748bd3..0048e61f4 100644
--- a/nxcomp/RenderPictureTransform.cpp
+++ b/nxcomp/src/RenderPictureTransform.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderPictureTransform.h b/nxcomp/src/RenderPictureTransform.h
index 649cd05d3..649cd05d3 100644
--- a/nxcomp/RenderPictureTransform.h
+++ b/nxcomp/src/RenderPictureTransform.h
diff --git a/nxcomp/RenderTrapezoids.cpp b/nxcomp/src/RenderTrapezoids.cpp
index 85f4cad05..bf84509dc 100644
--- a/nxcomp/RenderTrapezoids.cpp
+++ b/nxcomp/src/RenderTrapezoids.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderTrapezoids.h b/nxcomp/src/RenderTrapezoids.h
index faf524c76..faf524c76 100644
--- a/nxcomp/RenderTrapezoids.h
+++ b/nxcomp/src/RenderTrapezoids.h
diff --git a/nxcomp/RenderTriangles.cpp b/nxcomp/src/RenderTriangles.cpp
index 746a8e278..a5eb4d83d 100644
--- a/nxcomp/RenderTriangles.cpp
+++ b/nxcomp/src/RenderTriangles.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//
// Include the template for
// this message class.
diff --git a/nxcomp/RenderTriangles.h b/nxcomp/src/RenderTriangles.h
index d73efb7b8..d73efb7b8 100644
--- a/nxcomp/RenderTriangles.h
+++ b/nxcomp/src/RenderTriangles.h
diff --git a/nxcomp/Rgb.cpp b/nxcomp/src/Rgb.cpp
index 8946a9fc8..c98fa5147 100644
--- a/nxcomp/Rgb.cpp
+++ b/nxcomp/src/Rgb.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Rgb.h"
diff --git a/nxcomp/Rgb.h b/nxcomp/src/Rgb.h
index ec088dd1b..ec088dd1b 100644
--- a/nxcomp/Rgb.h
+++ b/nxcomp/src/Rgb.h
diff --git a/nxcomp/Rle.cpp b/nxcomp/src/Rle.cpp
index 92fc7785a..2a145aa0c 100644
--- a/nxcomp/Rle.cpp
+++ b/nxcomp/src/Rle.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Rle.h"
diff --git a/nxcomp/Rle.h b/nxcomp/src/Rle.h
index cc5dab0e8..cc5dab0e8 100644
--- a/nxcomp/Rle.h
+++ b/nxcomp/src/Rle.h
diff --git a/nxcomp/SendEvent.cpp b/nxcomp/src/SendEvent.cpp
index 8658c1835..8867d0a9e 100644
--- a/nxcomp/SendEvent.cpp
+++ b/nxcomp/src/SendEvent.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "SendEvent.h"
#include "ClientCache.h"
diff --git a/nxcomp/SendEvent.h b/nxcomp/src/SendEvent.h
index a8841a706..a8841a706 100644
--- a/nxcomp/SendEvent.h
+++ b/nxcomp/src/SendEvent.h
diff --git a/nxcomp/SequenceQueue.cpp b/nxcomp/src/SequenceQueue.cpp
index 3114bfcd0..a045875d7 100644
--- a/nxcomp/SequenceQueue.cpp
+++ b/nxcomp/src/SequenceQueue.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "SequenceQueue.h"
static const unsigned int INITIAL_SIZE_ = 16;
diff --git a/nxcomp/SequenceQueue.h b/nxcomp/src/SequenceQueue.h
index 2a72bc3fe..2a72bc3fe 100644
--- a/nxcomp/SequenceQueue.h
+++ b/nxcomp/src/SequenceQueue.h
diff --git a/nxcomp/ServerCache.cpp b/nxcomp/src/ServerCache.cpp
index 00693d2af..c4c088dca 100644
--- a/nxcomp/ServerCache.cpp
+++ b/nxcomp/src/ServerCache.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ServerCache.h"
//
diff --git a/nxcomp/ServerCache.h b/nxcomp/src/ServerCache.h
index c6e2b81b6..c6e2b81b6 100644
--- a/nxcomp/ServerCache.h
+++ b/nxcomp/src/ServerCache.h
diff --git a/nxcomp/ServerChannel.cpp b/nxcomp/src/ServerChannel.cpp
index eff24e90e..830985295 100644
--- a/nxcomp/ServerChannel.cpp
+++ b/nxcomp/src/ServerChannel.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <string.h>
#include <sys/types.h>
#include <sys/ipc.h>
@@ -497,13 +501,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
if (control -> LocalDeltaCompression == 0)
{
- int result = handleFastReadReply(encodeBuffer, requestOpcode,
+ int _result = handleFastReadReply(encodeBuffer, requestOpcode,
inputMessage, inputLength);
- if (result < 0)
+ if (_result < 0)
{
return -1;
}
- else if (result > 0)
+ else if (_result > 0)
{
continue;
}
@@ -786,9 +790,9 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
for (; numExtensions; numExtensions--)
{
- unsigned int length = (unsigned int) (*nextSrc++);
+ unsigned int _length = (unsigned int) (*nextSrc++);
- encodeBuffer.encodeValue(length, 8);
+ encodeBuffer.encodeValue(_length, 8);
#ifdef HIDE_MIT_SHM_EXTENSION
@@ -909,13 +913,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
const unsigned char* nextSrc = inputMessage + 32;
for (; numFonts; numFonts--)
{
- unsigned int length = (unsigned int) (*nextSrc++);
- encodeBuffer.encodeValue(length, 8);
+ unsigned int _length = (unsigned int) (*nextSrc++);
+ encodeBuffer.encodeValue(_length, 8);
// Since ProtoStep7 (#issue 108)
- encodeBuffer.encodeTextData(nextSrc, length);
+ encodeBuffer.encodeTextData(nextSrc, _length);
- nextSrc += length;
+ nextSrc += _length;
}
priority_++;
@@ -959,13 +963,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
encodeBuffer.encodeBoolValue(1);
unsigned int numColors = ((inputLength - 32) >> 3);
- const unsigned char *nextSrc = inputMessage + 40;
+ const unsigned char *nextSrc1 = inputMessage + 40;
unsigned char *nextDest = (unsigned char *) inputMessage + 38;
for (unsigned int c = 1; c < numColors; c++)
{
for (unsigned int i = 0; i < 6; i++)
- *nextDest++ = *nextSrc++;
- nextSrc += 2;
+ *nextDest++ = *nextSrc1++;
+ nextSrc1 += 2;
}
unsigned int colorsLength = numColors * 6;
if (serverCache_ -> queryColorsLastReply.compare(colorsLength,
@@ -973,13 +977,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
encodeBuffer.encodeBoolValue(1);
else
{
- const unsigned char *nextSrc = inputMessage + 32;
+ const unsigned char *nextSrc2 = inputMessage + 32;
encodeBuffer.encodeBoolValue(0);
encodeBuffer.encodeValue(numColors, 16, 5);
for (numColors *= 3; numColors; numColors--)
{
- encodeBuffer.encodeValue(GetUINT(nextSrc, bigEndian_), 16);
- nextSrc += 2;
+ encodeBuffer.encodeValue(GetUINT(nextSrc2, bigEndian_), 16);
+ nextSrc2 += 2;
}
}
@@ -1295,13 +1299,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
if (control -> LocalDeltaCompression == 0)
{
- int result = handleFastReadReply(encodeBuffer, requestOpcode,
+ int _result = handleFastReadReply(encodeBuffer, requestOpcode,
inputMessage, inputLength);
- if (result < 0)
+ if (_result < 0)
{
return -1;
}
- else if (result > 0)
+ else if (_result > 0)
{
continue;
}
@@ -1518,13 +1522,13 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
if (control -> LocalDeltaCompression == 0)
{
- int result = handleFastReadEvent(encodeBuffer, inputOpcode,
+ int _result = handleFastReadEvent(encodeBuffer, inputOpcode,
inputMessage, inputLength);
- if (result < 0)
+ if (_result < 0)
{
return -1;
}
- else if (result > 0)
+ else if (_result > 0)
{
continue;
}
@@ -1616,10 +1620,10 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
serverCache_ -> buttonCache);
else
encodeBuffer.encodeValue((unsigned int) detail, 8);
- unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
+ unsigned int _timestamp = GetULONG(inputMessage + 4, bigEndian_);
unsigned int timestampDiff =
- timestamp - serverCache_ -> lastTimestamp;
- serverCache_ -> lastTimestamp = timestamp;
+ _timestamp - serverCache_ -> lastTimestamp;
+ serverCache_ -> lastTimestamp = _timestamp;
encodeBuffer.encodeCachedValue(timestampDiff, 32,
serverCache_ -> motionNotifyTimestampCache, 9);
int skipRest = 0;
@@ -1791,10 +1795,10 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
29, serverCache_ -> propertyNotifyWindowCache, 9);
encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
29, serverCache_ -> propertyNotifyAtomCache, 9);
- unsigned int timestamp = GetULONG(inputMessage + 12, bigEndian_);
+ unsigned int _timestamp = GetULONG(inputMessage + 12, bigEndian_);
unsigned int timestampDiff =
- timestamp - serverCache_ -> lastTimestamp;
- serverCache_ -> lastTimestamp = timestamp;
+ _timestamp - serverCache_ -> lastTimestamp;
+ serverCache_ -> lastTimestamp = _timestamp;
encodeBuffer.encodeValue(timestampDiff, 32, 9);
encodeBuffer.encodeBoolValue((unsigned int) inputMessage[16]);
}
@@ -1815,9 +1819,9 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
break;
case SelectionClear:
{
- unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
- unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
- serverCache_ -> lastTimestamp = timestamp;
+ unsigned int _timestamp = GetULONG(inputMessage + 4, bigEndian_);
+ unsigned int timestampDiff = _timestamp - serverCache_ -> lastTimestamp;
+ serverCache_ -> lastTimestamp = _timestamp;
encodeBuffer.encodeValue(timestampDiff, 32, 9);
encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
29, serverCache_ -> selectionClearWindowCache, 9);
@@ -1827,9 +1831,9 @@ int ServerChannel::handleRead(EncodeBuffer &encodeBuffer, const unsigned char *m
break;
case SelectionRequest:
{
- unsigned int timestamp = GetULONG(inputMessage + 4, bigEndian_);
- unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
- serverCache_ -> lastTimestamp = timestamp;
+ unsigned int _timestamp = GetULONG(inputMessage + 4, bigEndian_);
+ unsigned int timestampDiff = _timestamp - serverCache_ -> lastTimestamp;
+ serverCache_ -> lastTimestamp = _timestamp;
encodeBuffer.encodeValue(timestampDiff, 32, 9);
encodeBuffer.encodeCachedValue(GetULONG(inputMessage + 8, bigEndian_),
29, serverCache_ -> selectionClearWindowCache, 9);
@@ -5665,9 +5669,9 @@ int ServerChannel::handleMotion(EncodeBuffer &encodeBuffer)
serverCache_ -> buttonCache);
else
encodeBuffer.encodeValue((unsigned int) detail, 8);
- unsigned int timestamp = GetULONG(buffer + 4, bigEndian_);
- unsigned int timestampDiff = timestamp - serverCache_ -> lastTimestamp;
- serverCache_ -> lastTimestamp = timestamp;
+ unsigned int _timestamp = GetULONG(buffer + 4, bigEndian_);
+ unsigned int timestampDiff = _timestamp - serverCache_ -> lastTimestamp;
+ serverCache_ -> lastTimestamp = _timestamp;
encodeBuffer.encodeCachedValue(timestampDiff, 32,
serverCache_ -> motionNotifyTimestampCache, 9);
int skipRest = 0;
@@ -7906,11 +7910,11 @@ void ServerChannel::handleEncodeCharInfo(const unsigned char *nextSrc, EncodeBuf
for (unsigned int i = 1; i < 5; i++)
{
- unsigned int value = GetUINT(nextSrc, bigEndian_);
+ unsigned int _value = GetUINT(nextSrc, bigEndian_);
nextSrc += 2;
- encodeBuffer.encodeCachedValue(value, 16,
+ encodeBuffer.encodeCachedValue(_value, 16,
*serverCache_ -> queryFontCharInfoCache[i], 6);
}
}
diff --git a/nxcomp/ServerChannel.h b/nxcomp/src/ServerChannel.h
index 374e52896..374e52896 100644
--- a/nxcomp/ServerChannel.h
+++ b/nxcomp/src/ServerChannel.h
diff --git a/nxcomp/ServerProxy.cpp b/nxcomp/src/ServerProxy.cpp
index 5d1765183..28f94842a 100644
--- a/nxcomp/ServerProxy.cpp
+++ b/nxcomp/src/ServerProxy.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <unistd.h>
#include "NXalert.h"
diff --git a/nxcomp/ServerProxy.h b/nxcomp/src/ServerProxy.h
index e169c4aec..e169c4aec 100644
--- a/nxcomp/ServerProxy.h
+++ b/nxcomp/src/ServerProxy.h
diff --git a/nxcomp/ServerReadBuffer.cpp b/nxcomp/src/ServerReadBuffer.cpp
index 5bd9bb60f..277b85216 100644
--- a/nxcomp/ServerReadBuffer.cpp
+++ b/nxcomp/src/ServerReadBuffer.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ServerReadBuffer.h"
#include "ServerChannel.h"
diff --git a/nxcomp/ServerReadBuffer.h b/nxcomp/src/ServerReadBuffer.h
index d6c207ead..d6c207ead 100644
--- a/nxcomp/ServerReadBuffer.h
+++ b/nxcomp/src/ServerReadBuffer.h
diff --git a/nxcomp/ServerStore.cpp b/nxcomp/src/ServerStore.cpp
index 0fb17d974..8123b6de0 100644
--- a/nxcomp/ServerStore.cpp
+++ b/nxcomp/src/ServerStore.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ServerStore.h"
//
diff --git a/nxcomp/ServerStore.h b/nxcomp/src/ServerStore.h
index dbbb968e5..dbbb968e5 100644
--- a/nxcomp/ServerStore.h
+++ b/nxcomp/src/ServerStore.h
diff --git a/nxcomp/SetClipRectangles.cpp b/nxcomp/src/SetClipRectangles.cpp
index 164ead006..b43cea938 100644
--- a/nxcomp/SetClipRectangles.cpp
+++ b/nxcomp/src/SetClipRectangles.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "SetClipRectangles.h"
#include "ClientCache.h"
diff --git a/nxcomp/SetClipRectangles.h b/nxcomp/src/SetClipRectangles.h
index a2245360c..a2245360c 100644
--- a/nxcomp/SetClipRectangles.h
+++ b/nxcomp/src/SetClipRectangles.h
diff --git a/nxcomp/SetUnpackAlpha.cpp b/nxcomp/src/SetUnpackAlpha.cpp
index cf09074e3..5a352d26a 100644
--- a/nxcomp/SetUnpackAlpha.cpp
+++ b/nxcomp/src/SetUnpackAlpha.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "SetUnpackAlpha.h"
#include "ClientCache.h"
diff --git a/nxcomp/SetUnpackAlpha.h b/nxcomp/src/SetUnpackAlpha.h
index 54714efaa..54714efaa 100644
--- a/nxcomp/SetUnpackAlpha.h
+++ b/nxcomp/src/SetUnpackAlpha.h
diff --git a/nxcomp/SetUnpackColormap.cpp b/nxcomp/src/SetUnpackColormap.cpp
index b44a7cf13..2c9bba1bd 100644
--- a/nxcomp/SetUnpackColormap.cpp
+++ b/nxcomp/src/SetUnpackColormap.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "SetUnpackColormap.h"
#include "ClientCache.h"
diff --git a/nxcomp/SetUnpackColormap.h b/nxcomp/src/SetUnpackColormap.h
index 779366531..779366531 100644
--- a/nxcomp/SetUnpackColormap.h
+++ b/nxcomp/src/SetUnpackColormap.h
diff --git a/nxcomp/SetUnpackGeometry.cpp b/nxcomp/src/SetUnpackGeometry.cpp
index 49fa4344e..edff6a544 100644
--- a/nxcomp/SetUnpackGeometry.cpp
+++ b/nxcomp/src/SetUnpackGeometry.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "SetUnpackGeometry.h"
#include "ClientCache.h"
diff --git a/nxcomp/SetUnpackGeometry.h b/nxcomp/src/SetUnpackGeometry.h
index 96104f57f..96104f57f 100644
--- a/nxcomp/SetUnpackGeometry.h
+++ b/nxcomp/src/SetUnpackGeometry.h
diff --git a/nxcomp/ShapeExtension.cpp b/nxcomp/src/ShapeExtension.cpp
index be3b9a903..2ee2b67db 100644
--- a/nxcomp/ShapeExtension.cpp
+++ b/nxcomp/src/ShapeExtension.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "ShapeExtension.h"
#include "ClientCache.h"
diff --git a/nxcomp/ShapeExtension.h b/nxcomp/src/ShapeExtension.h
index 4dd636847..4dd636847 100644
--- a/nxcomp/ShapeExtension.h
+++ b/nxcomp/src/ShapeExtension.h
diff --git a/nxcomp/Socket.cpp b/nxcomp/src/Socket.cpp
index 28cb5646d..8be04d76d 100644
--- a/nxcomp/Socket.cpp
+++ b/nxcomp/src/Socket.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/utsname.h>
diff --git a/nxcomp/Socket.h b/nxcomp/src/Socket.h
index 5e7e47705..77837a115 100644
--- a/nxcomp/Socket.h
+++ b/nxcomp/src/Socket.h
@@ -26,6 +26,10 @@
#ifndef Socket_H
#define Socket_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
@@ -35,6 +39,12 @@
#include <sys/filio.h>
#endif
+#ifdef HAVE_IN_ADDR_T
+#define IN_ADDR_T in_addr_t
+#else
+#define IN_ADDR_T unsigned
+#endif
+
//
// Set socket options.
//
diff --git a/nxcomp/Split.cpp b/nxcomp/src/Split.cpp
index b6828c7cb..e2fea97cc 100644
--- a/nxcomp/Split.cpp
+++ b/nxcomp/src/Split.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <unistd.h>
#include <cstring>
#include <sys/stat.h>
diff --git a/nxcomp/Split.h b/nxcomp/src/Split.h
index ee5eae7fe..ee5eae7fe 100644
--- a/nxcomp/Split.h
+++ b/nxcomp/src/Split.h
diff --git a/nxcomp/StaticCompressor.cpp b/nxcomp/src/StaticCompressor.cpp
index 93103af41..b47193354 100644
--- a/nxcomp/StaticCompressor.cpp
+++ b/nxcomp/src/StaticCompressor.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Z.h"
#include "Misc.h"
#include "Control.h"
diff --git a/nxcomp/StaticCompressor.h b/nxcomp/src/StaticCompressor.h
index e0b81a527..e0b81a527 100644
--- a/nxcomp/StaticCompressor.h
+++ b/nxcomp/src/StaticCompressor.h
diff --git a/nxcomp/Statistics.cpp b/nxcomp/src/Statistics.cpp
index baad7ef60..ab8fd74dc 100644
--- a/nxcomp/Statistics.cpp
+++ b/nxcomp/src/Statistics.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include "Statistics.h"
diff --git a/nxcomp/Statistics.h b/nxcomp/src/Statistics.h
index 1ffb6b5d6..1ffb6b5d6 100644
--- a/nxcomp/Statistics.h
+++ b/nxcomp/src/Statistics.h
diff --git a/nxcomp/Timestamp.cpp b/nxcomp/src/Timestamp.cpp
index d5b3d613b..e7e0c494a 100644
--- a/nxcomp/Timestamp.cpp
+++ b/nxcomp/src/Timestamp.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Timestamp.h"
//
diff --git a/nxcomp/Timestamp.h b/nxcomp/src/Timestamp.h
index 604f5a3bc..604f5a3bc 100644
--- a/nxcomp/Timestamp.h
+++ b/nxcomp/src/Timestamp.h
diff --git a/nxcomp/TranslateCoords.cpp b/nxcomp/src/TranslateCoords.cpp
index 97bd285e1..f61caea47 100644
--- a/nxcomp/TranslateCoords.cpp
+++ b/nxcomp/src/TranslateCoords.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "TranslateCoords.h"
#include "ClientCache.h"
diff --git a/nxcomp/TranslateCoords.h b/nxcomp/src/TranslateCoords.h
index 997d079e1..997d079e1 100644
--- a/nxcomp/TranslateCoords.h
+++ b/nxcomp/src/TranslateCoords.h
diff --git a/nxcomp/Transport.cpp b/nxcomp/src/Transport.cpp
index eaf9775af..897bf32f1 100644
--- a/nxcomp/Transport.cpp
+++ b/nxcomp/src/Transport.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
@@ -1408,7 +1412,7 @@ int ProxyTransport::read(unsigned char *data, unsigned int size)
<< logofs_flush;
#endif
- int result = inflate(&r_stream_, Z_SYNC_FLUSH);
+ result = inflate(&r_stream_, Z_SYNC_FLUSH);
#ifdef INSPECT
*logofs << "ProxyTransport: Called inflate() result is "
diff --git a/nxcomp/Transport.h b/nxcomp/src/Transport.h
index 047396af6..4ae0e3c25 100644
--- a/nxcomp/Transport.h
+++ b/nxcomp/src/Transport.h
@@ -413,9 +413,9 @@ class AgentTransport : public Transport
// These two should never be called.
//
- virtual int flush();
+ virtual int flush() __attribute__((noreturn));
- virtual int drain(int limit, int timeout);
+ virtual int drain(int limit, int timeout) __attribute((noreturn));
//
// Same as in the base class.
diff --git a/nxcomp/Types.h b/nxcomp/src/Types.h
index e82664c81..e82664c81 100644
--- a/nxcomp/Types.h
+++ b/nxcomp/src/Types.h
diff --git a/nxcomp/Unpack.cpp b/nxcomp/src/Unpack.cpp
index 50ae890b6..e63e836f0 100644
--- a/nxcomp/Unpack.cpp
+++ b/nxcomp/src/Unpack.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Misc.h"
#include "Unpack.h"
diff --git a/nxcomp/Unpack.h b/nxcomp/src/Unpack.h
index faaa41d82..faaa41d82 100644
--- a/nxcomp/Unpack.h
+++ b/nxcomp/src/Unpack.h
diff --git a/nxcomp/Vars.c b/nxcomp/src/Vars.c
index 685969677..685969677 100644
--- a/nxcomp/Vars.c
+++ b/nxcomp/src/Vars.c
diff --git a/nxcomp/Version.c b/nxcomp/src/Version.c
index ff1793434..509bd8344 100644
--- a/nxcomp/Version.c
+++ b/nxcomp/src/Version.c
@@ -20,6 +20,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/nxcomp/WriteBuffer.cpp b/nxcomp/src/WriteBuffer.cpp
index 07d14fc30..70b4e3b53 100644
--- a/nxcomp/WriteBuffer.cpp
+++ b/nxcomp/src/WriteBuffer.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stddef.h>
#include <string.h>
#include <unistd.h>
diff --git a/nxcomp/WriteBuffer.h b/nxcomp/src/WriteBuffer.h
index ce408e210..ce408e210 100644
--- a/nxcomp/WriteBuffer.h
+++ b/nxcomp/src/WriteBuffer.h
diff --git a/nxcomp/XidCache.cpp b/nxcomp/src/XidCache.cpp
index 0f83d388f..ab6574cc9 100644
--- a/nxcomp/XidCache.cpp
+++ b/nxcomp/src/XidCache.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Control.h"
#include "XidCache.h"
diff --git a/nxcomp/XidCache.h b/nxcomp/src/XidCache.h
index 8a09ef9b1..8a09ef9b1 100644
--- a/nxcomp/XidCache.h
+++ b/nxcomp/src/XidCache.h
diff --git a/nxcomp/Z.cpp b/nxcomp/src/Z.cpp
index 35850b9d0..af3b380f2 100644
--- a/nxcomp/Z.cpp
+++ b/nxcomp/src/Z.cpp
@@ -23,6 +23,10 @@
/* */
/**************************************************************************/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "Z.h"
#include "Misc.h"
diff --git a/nxcomp/Z.h b/nxcomp/src/Z.h
index 3a6d684c2..3a6d684c2 100644
--- a/nxcomp/Z.h
+++ b/nxcomp/src/Z.h
diff --git a/nxproxy/src/Makefile.am b/nxproxy/src/Makefile.am
index 5ec1f9401..60ace92ce 100644
--- a/nxproxy/src/Makefile.am
+++ b/nxproxy/src/Makefile.am
@@ -9,9 +9,9 @@ nxproxy_SOURCES = \
$(NULL)
nxproxy_LDADD = \
- -L$(top_srcdir)/../nxcomp/ -lXcomp \
+ -L$(top_srcdir)/../nxcomp/src/.libs -lXcomp \
$(NULL)
AM_CPPFLAGS = \
- -I$(top_srcdir)/../nxcomp/ \
+ -I$(top_srcdir)/../nxcomp/include/ \
$(NULL)