diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index e29e878d9..74e5111fb 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -38,6 +38,10 @@
 
 	* libc/include/string.h: Add cygwin-specific function declaration.
 
+2005-11-07  Corinna Vinschen  <corinna@vinschen.de>
+
+	* libc/include/ieeefp.h: Add C++ guards.
+
 2005-11-03  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/unix/getcwd.c: Don't use non-reentrant syscall names.
@@ -55,6 +59,7 @@
 	* libc/sys/linux/sys/unistd.h (readlink, symlink): New
 	prototypes.
 
+>>>>>>> 1.843
 2005-11-01  Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* libc/include/stdint.h: Cleanup #if vs. #ifdef.
diff --git a/newlib/libc/include/ieeefp.h b/newlib/libc/include/ieeefp.h
index 78bb5bf62..970ea4543 100644
--- a/newlib/libc/include/ieeefp.h
+++ b/newlib/libc/include/ieeefp.h
@@ -5,6 +5,8 @@
 
 #include <machine/ieeefp.h>
 
+_BEGIN_STD_C
+
 /* FIXME FIXME FIXME:
    Neither of __ieee_{float,double}_shape_tape seem to be used anywhere
    except in libm/test.  If that is the case, please delete these from here.
@@ -238,4 +240,6 @@ int _EXFUN(finitef, (float));
 
 #endif /* _DOUBLE_IS_32BITS */
 
+_END_STD_C
+
 #endif /* _IEEE_FP_H_ */