2 files changed, 20 insertions, 6 deletions
diff --git a/manual/arith.texi b/manual/arith.texi
index e160438938..e59da41c4b 100644
--- a/manual/arith.texi
+++ b/manual/arith.texi
@@ -2131,7 +2131,7 @@ larger range.
 
 If the string has valid syntax for an integer but the value is not
 representable because of overflow, @code{strtoll} returns either
-@code{LONG_LONG_MAX} or @code{LONG_LONG_MIN} (@pxref{Range of Type}), as
+@code{LLONG_MAX} or @code{LLONG_MIN} (@pxref{Range of Type}), as
 appropriate for the sign of the value.  It also sets @code{errno} to
 @code{ERANGE} to indicate there was overflow.
 
diff --git a/manual/lang.texi b/manual/lang.texi
index 9bc98710a8..b93ad5b5e8 100644
--- a/manual/lang.texi
+++ b/manual/lang.texi
@@ -827,25 +827,39 @@ These are the maximum values that can be represented by a
 @w{@code{signed long int}} and @code{unsigned long int}, respectively.
 
 @comment limits.h
-@comment GNU
-@item LONG_LONG_MIN
+@comment ISO
+@item LLONG_MIN
 
 This is the minimum value that can be represented by a @w{@code{signed
 long long int}}.  On most machines that the GNU C system runs on,
 @w{@code{long long}} integers are 64-bit quantities.
 
 @comment limits.h
-@comment GNU
-@item LONG_LONG_MAX
+@comment ISO
+@item LLONG_MAX
 @comment limits.h
 @comment ISO
-@itemx ULONG_LONG_MAX
+@itemx ULLONG_MAX
 
 These are the maximum values that can be represented by a @code{signed
 long long int} and @code{unsigned long long int}, respectively.
 
 @comment limits.h
 @comment GNU
+@item LONG_LONG_MIN
+@comment limits.h
+@comment GNU
+@itemx LONG_LONG_MAX
+@comment limits.h
+@comment GNU
+@itemx ULONG_LONG_MAX
+These are obsolete names for @code{LLONG_MIN}, @code{LLONG_MAX}, and
+@code{ULLONG_MAX}.  They are only available if @code{_GNU_SOURCE} is
+defined (@pxref{Feature Test Macros}).  In GCC versions prior to 3.0,
+these were the only names available.
+
+@comment limits.h
+@comment GNU
 @item WCHAR_MAX
 
 This is the maximum value that can be represented by a @code{wchar_t}.