From 9c5dea9a6b01e70026bdadf3ad62fa97ba496f93 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 31 Oct 2013 09:44:44 -0700 Subject: [PATCH] obstack: pacify HP C * lib/obstack.h (obstack_free) [!__GNUC__]: Rewrite to avoid warning "conversion from pointer to smaller integer" from HP C-ANSI-C - cc version B9007AA/B3910B A.06.26. It's safe to assume C89 or later nowadays, so cast to void instead of int. Privately reported by H.Merijn Brand. Also, change header to match glibc's, to make checking against glibc easier. --- ChangeLog | 10 ++++++++++ lib/obstack.h | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2fb9712d..009382cea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2013-10-31 Paul Eggert + + obstack: pacify HP C + * lib/obstack.h (obstack_free) [!__GNUC__]: Rewrite to avoid + warning "conversion from pointer to smaller integer" from HP + C-ANSI-C - cc version B9007AA/B3910B A.06.26. It's safe to assume + C89 or later nowadays, so cast to void instead of int. Privately + reported by H.Merijn Brand. Also, change header to match glibc's, + to make checking against glibc easier. + 2013-10-29 Jim Meyering maint.mk: prefer gpgv2 over gpgv diff --git a/lib/obstack.h b/lib/obstack.h index da45427f8..67c0b55b4 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -1,20 +1,20 @@ /* obstack.h - object stack macros - Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2013 Free Software - Foundation, Inc. + Copyright (C) 1988-2013 Free Software Foundation, Inc. This file is part of the GNU C Library. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU Lesser General Public + License along with this program; if not, see + . */ /* Summary: @@ -501,9 +501,9 @@ __extension__ \ ( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk, \ ((((h)->temp.tempint > 0 \ && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \ - ? (int) ((h)->next_free = (h)->object_base \ - = (h)->temp.tempint + (char *) (h)->chunk) \ - : (((__obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0))) + ? (void) ((h)->next_free = (h)->object_base \ + = (h)->temp.tempint + (char *) (h)->chunk) \ + : (__obstack_free) (h, (h)->temp.tempint + (char *) (h)->chunk))) #endif /* not __GNUC__ */ -- 2.11.0