diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index c6480a0d0..48bb2e147 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-23  Ken Werner  <ken.werner@de.ibm.com>
+
+	* libc/include/_ansi.h: _LONG_LONG renamed to _LONG_LONG_TYPE.
+	* libc/include/math.h: Likewise.
+		
 2008-04-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* libc/include/stdio.h (renameat): Declare for Cygwin.
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index b84f37791..a3f0334e3 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -45,8 +45,8 @@
 #ifndef _LONG_DOUBLE
 #define _LONG_DOUBLE long double
 #endif
-#ifndef _LONG_LONG
-#define _LONG_LONG long long
+#ifndef _LONG_LONG_TYPE
+#define _LONG_LONG_TYPE long long
 #endif
 #ifndef _PARAMS
 #define _PARAMS(paramlist)		paramlist
@@ -65,7 +65,7 @@
 #define	_DEFUN_VOID(name)		name()
 #define _CAST_VOID
 #define _LONG_DOUBLE double
-#define _LONG_LONG long
+#define _LONG_LONG_TYPE long
 #ifndef _PARAMS
 #define _PARAMS(paramlist)		()
 #endif
diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
index 3f7001a0c..ce7263194 100644
--- a/newlib/libc/include/math.h
+++ b/newlib/libc/include/math.h
@@ -226,7 +226,7 @@ extern double scalbln _PARAMS((double, long int));
 extern double tgamma _PARAMS((double));
 extern double nearbyint _PARAMS((double));
 extern long int lrint _PARAMS((double));
-extern _LONG_LONG int llrint _PARAMS((double));
+extern _LONG_LONG_TYPE int llrint _PARAMS((double));
 extern double round _PARAMS((double));
 extern long int lround _PARAMS((double));
 extern double trunc _PARAMS((double));
@@ -293,7 +293,7 @@ extern float scalblnf _PARAMS((float, long int));
 extern float tgammaf _PARAMS((float));
 extern float nearbyintf _PARAMS((float));
 extern long int lrintf _PARAMS((float));
-extern _LONG_LONG llrintf _PARAMS((float));
+extern _LONG_LONG_TYPE llrintf _PARAMS((float));
 extern float roundf _PARAMS((float));
 extern long int lroundf _PARAMS((float));
 extern float truncf _PARAMS((float));
@@ -335,7 +335,7 @@ extern float hypotf _PARAMS((float, float));
 /* Other long double precision functions.  */
 extern _LONG_DOUBLE rintl _PARAMS((_LONG_DOUBLE));
 extern long int lrintl _PARAMS((_LONG_DOUBLE));
-extern _LONG_LONG llrintl _PARAMS((_LONG_DOUBLE));
+extern _LONG_LONG_TYPE llrintl _PARAMS((_LONG_DOUBLE));
 
 #endif /* !defined (__STRICT_ANSI__) || defined(__cplusplus) || __STDC_VERSION__ >= 199901L */