about summary refs log tree commit diff
path: root/include/limits.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-24 00:22:08 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-24 00:22:08 +0000
commit945b22ed04767342dac1654f7e92ad5f8870361b (patch)
treeb4850d467a2bf93537e1e02e571834f36d7fbc92 /include/limits.h
parentbb3090cd0d36ea993175ee1fbf353c0adb18bf2f (diff)
downloadglibc-945b22ed04767342dac1654f7e92ad5f8870361b.tar.gz
glibc-945b22ed04767342dac1654f7e92ad5f8870361b.tar.xz
glibc-945b22ed04767342dac1654f7e92ad5f8870361b.zip
Update.
2000-07-23  Ulrich Drepper  <drepper@redhat.com>

	* locale/iso-639.def: Some errors corrected.
	Patch by Keld Simonsen.

	* include/limits.h: Update non-gcc portion.
	Patch by Joseph S. Myers <jsm28@cam.ac.uk>.
Diffstat (limited to 'include/limits.h')
-rw-r--r--include/limits.h25
1 files changed, 14 insertions, 11 deletions
diff --git a/include/limits.h b/include/limits.h
index 71222d7a67..23b4f4045a 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 96, 97, 98, 99 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -92,11 +92,7 @@
 #  define INT_MAX	2147483647
 
 /* Maximum value an `unsigned int' can hold.  (Minimum is 0.)  */
-#  ifdef __STDC__
-#   define UINT_MAX	4294967295U
-#  else
-#   define UINT_MAX	4294967295
-#  endif
+#  define UINT_MAX	4294967295U
 
 /* Minimum and maximum values a `signed long int' can hold.  */
 #  ifdef __alpha__
@@ -110,13 +106,20 @@
 #  ifdef __alpha__
 #   define ULONG_MAX	18446744073709551615UL
 #  else
-#   ifdef __STDC__
-#    define ULONG_MAX	4294967295UL
-#   else
-#    define ULONG_MAX	4294967295L
-#   endif
+#   define ULONG_MAX	4294967295UL
 #  endif
 
+#  ifdef __USE_ISOC99
+
+/* Minimum and maximum values a `signed long long int' can hold.  */
+#   define LLONG_MAX	9223372036854775807LL
+#   define LLONG_MIN	(-LLONG_MAX - 1LL)
+
+/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0.)  */
+#   define ULLONG_MAX	18446744073709551615ULL
+
+#  endif /* ISO C99 */
+
 # endif	/* limits.h  */
 #endif	/* GCC 2.  */