diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4e8d7c573f8..631ff26ea0e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2008-06-21 Jonathan Wakely + + * include/c_global/climits, include/tr1/climits: Add parentheses. + 2008-06-17 Ralf Wildenhues * configure: Regenerate. diff --git a/libstdc++-v3/include/c_global/climits b/libstdc++-v3/include/c_global/climits index 910c80a444f..87f585d489a 100644 --- a/libstdc++-v3/include/c_global/climits +++ b/libstdc++-v3/include/c_global/climits @@ -1,7 +1,7 @@ // -*- C++ -*- forwarding header. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007 +// 2006, 2007, 2008 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -51,7 +51,7 @@ #define _GLIBCXX_CLIMITS 1 #ifndef LLONG_MIN -#define LLONG_MIN -__LONG_LONG_MAX__ - 1 +#define LLONG_MIN (-__LONG_LONG_MAX__ - 1) #endif #ifndef LLONG_MAX @@ -59,7 +59,7 @@ #endif #ifndef ULLONG_MAX -#define ULLONG_MAX __LONG_LONG_MAX__ * 2ULL + 1 +#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1) #endif #endif diff --git a/libstdc++-v3/include/tr1/climits b/libstdc++-v3/include/tr1/climits index 9c7b0c5807c..62a3d1464f5 100644 --- a/libstdc++-v3/include/tr1/climits +++ b/libstdc++-v3/include/tr1/climits @@ -1,6 +1,6 @@ // TR1 climits -*- C++ -*- -// Copyright (C) 2006, 2007 Free Software Foundation, Inc. +// Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -37,7 +37,7 @@ #include #ifndef LLONG_MIN -#define LLONG_MIN -__LONG_LONG_MAX__ - 1 +#define LLONG_MIN (-__LONG_LONG_MAX__ - 1) #endif #ifndef LLONG_MAX @@ -45,7 +45,7 @@ #endif #ifndef ULLONG_MAX -#define ULLONG_MAX __LONG_LONG_MAX__ * 2ULL + 1 +#define ULLONG_MAX (__LONG_LONG_MAX__ * 2ULL + 1) #endif #endif // _GLIBCXX_TR1_CLIMITS