Merge branch 'uli42-pr/various9' into 3.6.x

Attributes GH PR #1029: https://github.com/ArcticaProject/nx-libs/pull/1029

14 files changed, 55 insertions, 55 deletions

diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
index 612bc4e38..ce33e4208 100644
--- a/nx-X11/config/cf/Imake.cf
+++ b/nx-X11/config/cf/Imake.cf
@@ -1,13 +1,13 @@
 /*
  * To add support for another platform:
- * 
- *     1.  Identify a machine-specific cpp symbol.  If your preprocessor 
+ *
+ *     1.  Identify a machine-specific cpp symbol.  If your preprocessor
  *         does not have any built in, you will need to add the symbol to the
  *         cpp_argv table in config/imake/imakemdep.h and rebuild imake with
  *         the BOOTSTRAPCFLAGS variable set (see the macII for an example).
  *
  *     2.  Add all machine-specific cpp symbols (either defined by you or by
- *         the preprocessor or compiler) to the predefs table in 
+ *         the preprocessor or compiler) to the predefs table in
  *         config/imake/imakemdep.h.
  *
  *     3.  But a new #ifdef block below that defines MacroIncludeFile and
@@ -167,7 +167,7 @@
 #   define Mvme68kArchitecture
 #   undef mvme68k
 #  endif
-#  if defined(sun3) 
+#  if defined(sun3)
 #   define Sun3Architecture
 #   undef sun3
 #  endif
@@ -571,7 +571,7 @@
 #ifdef MOTOROLA
 # define MacroIncludeFile <moto.cf>
 # define MacroFile moto.cf
-# undef MOTOROLA	
+# undef MOTOROLA
 # ifdef SYSV
 #  define MotoR3Architecture
 # endif
@@ -599,8 +599,8 @@
 # ifdef i386
 # undef i386
 #  ifdef ISC
-#   define i386Architecture	
-#   define i386SVR3Architecture	
+#   define i386Architecture
+#   define i386SVR3Architecture
 #   define MacroIncludeFile <isc.cf>
 #   define MacroFile isc.cf
 #   define i386IscArchitecture
@@ -642,8 +642,8 @@
 #  undef SVR4
 # else /* ! SVR4 */
 #  ifdef ISC
-#   define i386Architecture	
-#   define i386SVR3Architecture	
+#   define i386Architecture
+#   define i386SVR3Architecture
 #   define MacroIncludeFile <isc.cf>
 #   define MacroFile isc.cf
 #   define i386IscArchitecture
@@ -893,9 +893,9 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 #  endif
 #  undef __sparc__
 # endif
-# ifdef ia64 
+# ifdef ia64
 #  define ia64Architecture
-#  undef ia64 
+#  undef ia64
 # endif
 # ifdef __ia64__
 #  ifndef ia64Architecture
@@ -1016,7 +1016,7 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
 # define NecArchitecture
 #endif
 
-#ifdef minix 
+#ifdef minix
 #define MacroIncludeFile <minix.cf>
 #define MacroFile minix.cf
 #undef minix
diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile
index 714a865c9..521e7e900 100644
--- a/nx-X11/config/cf/Imakefile
+++ b/nx-X11/config/cf/Imakefile
@@ -13,7 +13,7 @@ host.def
 #endif
 
 #if defined(XorgVersion)
-VERSIONDEFFILES = 
+VERSIONDEFFILES =
 #endif
 
 DEFFILES = \
diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README
index 24ac7f52c..b6c1580df 100644
--- a/nx-X11/config/cf/README
+++ b/nx-X11/config/cf/README
@@ -276,9 +276,9 @@ An <os>Lib.rules file provides defaults for the following variables:
 	PositionIndependentCFlags 		PIC compiler flags for C
 	PositionIndependentCplusplusFlags	PIC compiler flags for C++
 
-	  Note: PositionIndependentCplusplusFlags is only required if the 
+	  Note: PositionIndependentCplusplusFlags is only required if the
 	  C and C++ compilers use different flags to build PIC code.  The
-	  default configuration will try to use PositionIndependentCFlags 
+	  default configuration will try to use PositionIndependentCFlags
 	  for both C and C++ compiles.
 
 An <os>Lib.tmpl file provides defaults for the following variables:
@@ -361,7 +361,7 @@ SUBDIRS			for an Imakefile in a directory containing
 			and call MakeSubdirs() and DependSubdirs().
 MANSUFFIX		suffix used by InstallManPage* rules.
 			May be set to $(LIBMANSUFFIX), $(FILEMANSUFFIX), or
-			$(MISCMANSUFFIX) in directories for libraries or data 
+			$(MISCMANSUFFIX) in directories for libraries or data
 			files.
 
 
diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl
index ffdca6811..3d27cc9b3 100644
--- a/nx-X11/config/cf/Server.tmpl
+++ b/nx-X11/config/cf/Server.tmpl
@@ -62,7 +62,7 @@ EXT_DEFINES = ExtensionDefines
 OS_DEFINES  = ServerOSDefines
 
 GLX_DEFINES = GlxDefines
- 
+
 #ifndef GlxUseSGISI
 #define GlxUseSGISI   NO
 #endif
diff --git a/nx-X11/config/cf/Threads.tmpl b/nx-X11/config/cf/Threads.tmpl
index d2d6f6d1c..93d7cc44a 100644
--- a/nx-X11/config/cf/Threads.tmpl
+++ b/nx-X11/config/cf/Threads.tmpl
@@ -2,7 +2,7 @@
  * For a multi-threaded application or library,
  * Define LocalThreadsDefines in your Imakefile (unless you like the
  * project default), then include this file.
- * Everything else should be automatic. 
+ * Everything else should be automatic.
  */
 
 #ifndef LocalThreadsDefines
diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules
index af3473c3a..932d3b5ff 100644
--- a/nx-X11/config/cf/X11.rules
+++ b/nx-X11/config/cf/X11.rules
@@ -6,9 +6,9 @@
 # define X11IsTopLevelProject	NO
 #endif
 
-/* 
+/*
  * If no clues are given assume X11 is in the tree, otherwise
- * UseInstalled overrides UseImports.  Do not do both. 
+ * UseInstalled overrides UseImports.  Do not do both.
  */
 #ifndef UseInstalledX11
 # define UseInstalledX11	NO
@@ -32,7 +32,7 @@
 
 #if defined(X11ProjectRoot)
 # define XBinDir	$(XPROJECTROOT)/lib/nx/bin
-#elif defined(ProjectRoot) 
+#elif defined(ProjectRoot)
 # define XBinDir	$(PROJECTROOT)/lib/nx/bin
 #else
 # define XBinDir	$(BINDIR)
@@ -75,7 +75,7 @@
 #define LdPostLibs	LdPostLib XLdPostLibs
 
 #ifndef TopXInclude
-# if ImportX11 
+# if ImportX11
 #  define TopXInclude	-I$(TOP)/imports/x11/include
 # elif !UseInstalledX11
 #  define TopXInclude	-I$(TOP)/exports/include
@@ -126,6 +126,6 @@
 
 #if  XtransFailSoft
 # define XtransFailDefine /**/
-#else 
+#else
 # define XtransFailDefine -DFAIL_HARD
 #endif
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index a5349e0eb..e9b6695d0 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -43,7 +43,7 @@ XCOMM ----------------------------------------------------------------------
 # define XOrgWebSupportAddress http://wiki.X.Org
 #endif
 
-XORGRELSTRING = XorgManVersionString 	 
+XORGRELSTRING = XorgManVersionString
   XORGMANNAME = XOrgManNameString
 
 #ifndef XOrgManDefs
@@ -98,11 +98,11 @@ XORGRELSTRING = XorgManVersionString
 #ifndef HasXServer
 #define HasXServer		YES
 #endif
-/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf 
+/* xorg.cf sets XorgServer to YES - to build Xorg you must include xorg.cf
  * from the .cf file for your platform.
  */
 #ifndef XorgServer
-#define XorgServer		NO  
+#define XorgServer		NO
 #endif
 #ifndef BuildServer
 #define BuildServer		HasXServer
@@ -130,7 +130,7 @@ XORGRELSTRING = XorgManVersionString
 #define InstallXcmsTxt		YES
 #endif
 /*
- * This disables XLOCALEDIR. 
+ * This disables XLOCALEDIR.
  */
 #ifndef DisableXLocaleDirEnv
 #define DisableXLocaleDirEnv	NO
@@ -1072,7 +1072,7 @@ XCOMM X Window System make variables; these need to be coordinated with rules
      TRANSCOMMSRC = $(LIBSRC)/xtrans
    TRANS_INCLUDES = -I$(TRANSCOMMSRC)
  CONNECTION_FLAGS = ConnectionFlags ExtraConnectionDefs
-XTRANS_FAILDEFINES = XtransFailDefine 
+XTRANS_FAILDEFINES = XtransFailDefine
 #ifdef X11ProjectRoot
      XPROJECTROOT = X11ProjectRoot
 #endif
@@ -1090,7 +1090,7 @@ VENDORSUPPORTDEFS = VendorSupportDefines
 
       XKBDEFRULES = XkbDefaultRulesFile
   XKBDEFRULESDEFS = XkbDefRulesDefines
-  
+
      XCONFIGFILE = XConfigFile
       XCONFIGDIR = XConfigDir
         XLOGFILE = XLogFile
@@ -1200,7 +1200,7 @@ MOTIFLIB = -L$(MOTIFLIBDIR) LinkerRuntimeLibraryPathFlag($(MOTIFLIBDIR)) -lXm
 #endif
 
 #if MotifIncDirStandard
-MOTIFINCLUDES = 
+MOTIFINCLUDES =
 #else
 MOTIFINCLUDES = -I$(MOTIFINCDIR)
 #endif
diff --git a/nx-X11/config/cf/cross.def b/nx-X11/config/cf/cross.def
index d1b737fcc..06dbf0909 100644
--- a/nx-X11/config/cf/cross.def
+++ b/nx-X11/config/cf/cross.def
@@ -16,7 +16,7 @@
 				-D_DEFAULT_SOURCE -D_GNU_SOURCE -DX_LOCALE
 #undef CcCmd
 #define StdIncDir /opt/Embedix/tools/arm-linux/include
-#define PreIncDir 
+#define PreIncDir
 #undef PostIncDir
 #define PostIncDir /opt/Embedix/tools/lib/gcc-lib/arm-linux/2.95.2/include
 #define CcCmd /opt/Embedix/tools/bin/arm-linux-gcc
diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def
index 3638e0528..7546d49f3 100644
--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -223,8 +223,8 @@
                           -Wredundant-decls -Wnested-externs -Wshadow
  */
 
-/* 
- * Sun Compiler stuff.. 
+/*
+ * Sun Compiler stuff..
  *
 #define HasSunC                         YES
 #define HasSunCplusplus                 YES
@@ -241,8 +241,8 @@
 #define OptimizedCDebugFlags            -xO4 -xtarget=pentium_pro
  */
 
-/* 
- * Debuggable Sun Compiler Build. 
+/*
+ * Debuggable Sun Compiler Build.
  * Note: This builds _EVERYTHING_ as debuggable
  *
 #define DefaultCDebugFlags              -g -xs
@@ -350,7 +350,7 @@
  */
 #define BuildScreenSaverExt	YES
 
-/* 
+/*
  * If you don't want to build Xinerama support, uncomment this.
  *
 #define BuildXinerama		NO
@@ -424,13 +424,13 @@
 /*
  * For a POSIXized build on Interactive uncomment this
  * Could be used with gcc 'till Version 2.6.3
- * Should be used with gcc 2.7.2. 
+ * Should be used with gcc 2.7.2.
  *
 #define UsePosix		YES
  */
 
 /*
- * If you don't want XDMAUTH support (if you don't have Wraphelp.c), 
+ * If you don't want XDMAUTH support (if you don't have Wraphelp.c),
  *  comment this out.
  *
  */
@@ -540,4 +540,4 @@
  * libx86emu set library path here
  *
 #define X86EMU_LIBPATH /usr/local/lib
- */ 
+ */
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 6851be558..283c0a000 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -282,7 +282,7 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 # endif
 #endif
 
-/* 
+/*
  * Let the OS restore console fonts instead of the generic VGA
  * layer. This exists for Linux only at the moment so put it
  * here.
@@ -832,7 +832,7 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #  else
 #   define SuperHArchOptFlags	-m3
 #  endif
-# endif 
+# endif
 # ifndef SuperHebArchitecture
 #  ifdef SuperHebArchitecture
 #   define SuperHEndianFlags	-mb
diff --git a/nx-X11/config/cf/xf86.rules b/nx-X11/config/cf/xf86.rules
index 879bd3c90..c83869dc5 100644
--- a/nx-X11/config/cf/xf86.rules
+++ b/nx-X11/config/cf/xf86.rules
@@ -25,7 +25,7 @@ clean::									@@\
 #ifndef Depend
 # define Depend depend
 #endif
- 
+
 #ifndef ConfigTargetLong
 #define ConfigTargetLong(target,dep,script,args,extra)			@@\
 all:: Configure								@@\
diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf
index 8d39c338a..c0b753a88 100644
--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -16,7 +16,7 @@
 # if XORG_VERSION_SNAP == 0
 #  if XORG_VERSION_PATCH == 0
 #   define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR | sed 's/ /./g'`
-#  else 
+#  else
 #   define XorgVersionString `echo XORG_VERSION_MAJOR XORG_VERSION_MINOR XORG_VERSION_PATCH | sed 's/ /./g'`
 #  endif
 # else
@@ -499,7 +499,7 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #endif
 
 /*
- * Build the X-Resource Extension 
+ * Build the X-Resource Extension
  */
 #ifndef BuildXResExt
 # define BuildXResExt                   YES
@@ -843,7 +843,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
 # ifndef Has3DNowSupport
 #  define Has3DNowSupport NO
 # endif
-#else 
+#else
 # ifndef HasX86Support
 #  define HasX86Support NO
 # endif
@@ -864,7 +864,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
   || defined (ia64Architecture) \
   || defined (PpcArchitecture) \
   || defined (SparcArchitecture) \
-  || defined (s390xArchitecture) 
+  || defined (s390xArchitecture)
 #  define StaticNeedsPicForShared YES
 # else
 #  define StaticNeedsPicForShared NO
diff --git a/nx-X11/config/cf/xorg.tmpl b/nx-X11/config/cf/xorg.tmpl
index 2737ebdf9..b23be5af8 100644
--- a/nx-X11/config/cf/xorg.tmpl
+++ b/nx-X11/config/cf/xorg.tmpl
@@ -12,7 +12,7 @@ CONFIG_DEFINES = ConfigDefines
 
 #ifdef BuilderEMailAddr
 BUILDERADDR = BuilderEMailAddr
-#else 
+#else
 BUILDERADDR = "xorg@lists.freedesktop.org"
 #endif
 #ifdef VendorSupportAddress
diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def
index 5c5cf4431..8785ae672 100644
--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -116,8 +116,8 @@
                           -Wredundant-decls -Wnested-externs -Wshadow
  */
 
-/* 
- * Sun Compiler stuff.. 
+/*
+ * Sun Compiler stuff..
  *
 #define HasSunC                         YES
 #define HasSunCplusplus                 YES
@@ -134,8 +134,8 @@
 #define OptimizedCDebugFlags            -xO4 -xtarget=pentium_pro
  */
 
-/* 
- * Debuggable Sun Compiler Build. 
+/*
+ * Debuggable Sun Compiler Build.
  * Note: This builds _EVERYTHING_ as debuggable
  *
 #define DefaultCDebugFlags              -g -xs
@@ -226,7 +226,7 @@
 #define BuildScreenSaverExt	NO
  */
 
-/* 
+/*
  * If you don't want to build Xinerama support, uncomment this.
  *
 #define BuildXinerama		NO
@@ -263,13 +263,13 @@
 /*
  * For a POSIXized build on Interactive uncomment this
  * Could be used with gcc 'till Version 2.6.3
- * Should be used with gcc 2.7.2. 
+ * Should be used with gcc 2.7.2.
  *
 #define UsePosix		YES
  */
 
 /*
- * If you don't want XDMAUTH support (if you don't have Wraphelp.c), 
+ * If you don't want XDMAUTH support (if you don't have Wraphelp.c),
  *  comment this out.
  *
  */
@@ -375,4 +375,4 @@
  * libx86emu set library path here
  *
 #define X86EMU_LIBPATH /usr/local/lib
- */ 
+ */