From: Ulrich Wilkens <mail@uwilkens.de>
Date: Wed, 12 Mar 2014 18:43:12 +0000 (+0100)
Subject: Fix cpp output on Ubuntu 13
X-Git-Tag: 2.2.2~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a9bf30d12ba758339ea7ab460d2e530716cf81b2;p=oweals%2Fcde.git

Fix cpp output on Ubuntu 13
---

diff --git a/cde/config/cf/Imake.rules b/cde/config/cf/Imake.rules
index 6b21cd70..6fa1ecc8 100644
--- a/cde/config/cf/Imake.rules
+++ b/cde/config/cf/Imake.rules
@@ -2376,7 +2376,7 @@ MakeMakeSubdirs(dirs,Makefiles)
  * Also delete line numbers from the cpp output (-P is not portable, I guess).
  */
 #ifndef CppSedMagic
-#define CppSedMagic $(SED) -e '/^#  *[0-9][0-9]*  *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
+#define CppSedMagic $(SED) -e '/^#[line]* *[0-9][0-9]*  *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
 #endif /* CppSedMagic */
 
 #ifndef CppFileTarget
diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index 4d1c6ab4..81248553 100644
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -121,7 +121,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define LdCombineFlags		-r
 #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
 #define HasWChar32		YES
-#define StandardCppDefines	-traditional StandardDefines
+#define StandardCppDefines	-traditional -nostdinc StandardDefines
 #define ExtensionOSDefines	-DXTESTEXT1
 
 #define LinuxLocaleDefines	/**/