--- emacs-18.59-orig/src/ChangeLog
+++ emacs-18.59/src/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-11  Ulrich Mueller  <ulm@gentoo.org>
+
+	* Makefile (xmakefile): Call C preprocessor with -P option,
+	in order to fix building with GNU CPP 4.5.
+	http://bugs.gentoo.org/308653
+	http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41748
+
 2008-10-21  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs.c: Handle gap between end of BSS and heap, backported
--- emacs-18.59-orig/src/Makefile
+++ emacs-18.59/src/Makefile
@@ -33,7 +33,7 @@
 xmakefile: ymakefile config.h
 	-rm -f xmakefile junk.c
 	cp ymakefile junk.c
-	$(CPP) junk.c | sed -e 's/^#.*//' -e 's/^[ 	][ 	]*$$//' -e 's/^ /	/' | \
+	$(CPP) -P junk.c | sed -e 's/^#.*//' -e 's/^[ 	][ 	]*$$//' -e 's/^ /	/' | \
 	sed -n -e '/^..*$$/p' > xmakefile
 	rm -f junk.c