Fix cpp output on Ubuntu 13

diff --git a/cde/config/cf/Imake.rules b/cde/config/cf/Imake.rules
index 6b21cd70df4534dd4aad99d5f3625cc2be091b12..6fa1ecc830963e14a90d506375714e3cf0f7a248 100644 (file)
--- 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 4d1c6ab46e40cc816267b233e2e9232570f7345e..812485538a7e23577b370a52abf9aa1945f605e7 100644 (file)
--- 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     /**/