merge of 2043b4a4bc8f0359b8c216306758ab5900533fde

     and fde883376d5d9573d47686c91400d14495518411

4 files changed, 10 insertions, 16 deletions

diff --git a/libdw/libdw.h b/libdw/libdw.h
index 424c354e..0758a38d 100644
--- a/libdw/libdw.h
+++ b/libdw/libdw.h
@@ -1,7 +1,6 @@
 /* Interfaces for libdw.
    Copyright (C) 2002, 2004, 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
-   Contributed by Ulrich Drepper <[email protected]>, 2002.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by the
diff --git a/libelf/libelfP.h b/libelf/libelfP.h
index ed6b5f7f..54158aeb 100644
--- a/libelf/libelfP.h
+++ b/libelf/libelfP.h
@@ -1,5 +1,5 @@
 /* Internal interfaces for libelf.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 Red Hat, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Contributed by Ulrich Drepper <[email protected]>, 1998.
 
@@ -546,9 +546,8 @@ extern uint32_t __libelf_crc32 (uint32_t crc, unsigned char *buf, size_t len)
 
 
 /* We often have to update a flag iff a value changed.  Make this
-   convenient.  None of the parameters must have a side effect.  */
-#ifdef __GNUC__
-# define update_if_changed(var, exp, flag) \
+   convenient.  */
+#define update_if_changed(var, exp, flag) \
   do {									      \
     __typeof__ (var) *_var = &(var);					      \
     __typeof__ (exp) _exp = (exp);					      \
@@ -558,15 +557,5 @@ extern uint32_t __libelf_crc32 (uint32_t crc, unsigned char *buf, size_t len)
 	(flag) |= ELF_F_DIRTY;						      \
       }									      \
   } while (0)
-#else
-# define update_if_changed(var, exp, flag) \
-  do {									      \
-    if ((var) != (exp))							      \
-      {									      \
-	(var) = (exp);							      \
-	(flag) |= ELF_F_DIRTY;						      \
-      }									      \
-  } while (0)
-#endif
 
 #endif  /* libelfP.h */
diff --git a/src/ChangeLog b/src/ChangeLog
index 8ed1b34f..fb4e011d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -21,6 +21,11 @@
 	combinations.
 	(mark_as_needed): Fix loop.
 
+2006-05-28  Ulrich Drepper  <[email protected]>
+
+	* addr2line.c (print_dwarf_function): Use unsigned type for lineno
+	and colno.
+
 2006-05-27  Ulrich Drepper  <[email protected]>
 
 	* readelf.c (handle_relocs_rela): Better notations for addon value.
diff --git a/src/addr2line.c b/src/addr2line.c
index bc0ea803..1729058e 100644
--- a/src/addr2line.c
+++ b/src/addr2line.c
@@ -258,7 +258,8 @@ print_dwarf_function (Dwfl_Module *mod, Dwarf_Addr addr)
 					       &attr_mem), &val) == 0)
 		{
 		  const char *file = dwarf_filesrc (files, val, NULL, NULL);
-		  int lineno = 0, colno = 0;
+		  unsigned int lineno = 0;
+		  unsigned int colno = 0;
 		  if (dwarf_formudata (dwarf_attr (&scopes[i],
 						   DW_AT_call_line,
 						   &attr_mem), &val) == 0)