From 7bb764bcb177f580e9f676680423ed3ddb13d8e7 Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 22 Feb 2012 21:04:27 +0000
Subject: [PATCH] Prefer C99 names for long long limit macros.

---
 ChangeLog         | 11 +++++++++++
 NEWS              |  9 +++++----
 manual/arith.texi |  2 +-
 manual/lang.texi  | 24 +++++++++++++++++++-----
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 153d80ff03..1ade4f1aee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,15 @@
 2012-02-22  Joseph Myers  <joseph@codesourcery.com>
+	    Roland McGrath  <roland@hack.frob.com>
+
+	[BZ #5461]
+	* manual/arith.texi (strtoll): Refer to LLONG_MAX and LLONG_MIN,
+	not LONG_LONG_MAX and LONG_LONG_MIN.
+	* manual/lang.texi (LONG_LONG_MIN): Document first as ISO
+	LLONG_MIN.  Refer to LONG_LONG_MIN only as older GCC-specific
+	name.
+	(LONG_LONG_MAX, LLONG_MAX, ULONG_LONG_MAX, ULLONG_MAX): Likewise.
+
+2012-02-22  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #2547]
 	[BZ #11365]
diff --git a/NEWS b/NEWS
index 822caa01a4..8dfa97100f 100644
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,11 @@ Version 2.16
 
 * The following bugs are resolved with this release:
 
-  174, 350, 411, 2547, 2548, 3335, 4026, 4596, 4822, 5077, 5805, 5993, 6884,
-  6907, 9739, 9902, 10110, 10140, 10210, 11174, 11322, 11365, 11494, 12047,
-  13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533,
-  13547, 13551, 13552, 13553, 13555, 13559, 13583, 13618, 13695, 13704
+  174, 350, 411, 2547, 2548, 3335, 4026, 4596, 4822, 5077, 5461, 5805, 5993,
+  6884, 6907, 9739, 9902, 10110, 10140, 10210, 11174, 11322, 11365, 11494,
+  12047, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532,
+  13533, 13547, 13551, 13552, 13553, 13555, 13559, 13583, 13618, 13695,
+  13704
 
 * ISO C11 support:
 
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}.
-- 
2.11.4.GIT