diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /include/limits.h | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'include/limits.h')
| -rw-r--r-- | include/limits.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/include/limits.h b/include/limits.h index 45cd6f253..3e9a5df88 100644 --- a/include/limits.h +++ b/include/limits.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 92, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 1997, 1998, 1999, 2000, 2005 + 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 @@ -122,20 +123,20 @@ #if defined __GNUC__ && !defined _GCC_LIMITS_H_ /* `_GCC_LIMITS_H_' is what GCC's file defines. */ # include_next <limits.h> +#endif /* The <limits.h> files in some gcc versions don't define LLONG_MIN, LLONG_MAX, and ULLONG_MAX. Instead only the values gcc defined for ages are available. */ -# ifdef __USE_ISOC99 -# ifndef LLONG_MIN -# define LLONG_MIN LONG_LONG_MIN -# endif -# ifndef LLONG_MAX -# define LLONG_MAX LONG_LONG_MAX -# endif -# ifndef ULLONG_MAX -# define ULLONG_MAX ULONG_LONG_MAX -# endif +#if defined __USE_ISOC99 && defined __GNUC__ +# ifndef LLONG_MIN +# define LLONG_MIN (-LLONG_MAX-1) +# endif +# ifndef LLONG_MAX +# define LLONG_MAX __LONG_LONG_MAX__ +# endif +# ifndef ULLONG_MAX +# define ULLONG_MAX (LLONG_MAX * 2ULL + 1) # endif #endif |