Re: [PATCH v2] C++: dlsym casts in gdb/linux-thread-db.c and gdb/gdbserver/thread-db.c

["Ulrich Weigand" <uweigand@de.ibm.com>]

Pedro Alves wrote:
> On 08/05/2015 02:34 PM, Ulrich Weigand wrote:
> > It seems this is caused by the nat/gdb_thread_db.h header file
> > being included twice into gdbserver/thread-db.c:
> > 
> > 1) via line 23:
> > #include "linux-low.h"
> > (which includes "nat/gdb_thread_db.h" at line 20)
> > 
> > 2) directly in line 30:
> > #include "nat/gdb_thread_db.h"
> > 
> > and the file not being guarded against double inclusion.
> 
> Yeah, I think we should just add the guards.
> 
> Are you already taking care of that, or would you like me to?

I've now checked in the patch below.  (Also adding the missing
copyright header while I was at it.)

Tested on i686-linux.

Bye,
Ulrich

ChangeLog:

	* nat/gdb_thread_db.h: Add copyright header.
	Protect against multiple inclusion.

diff --git a/gdb/nat/gdb_thread_db.h b/gdb/nat/gdb_thread_db.h
index 2938eaf..3be4170 100644
--- a/gdb/nat/gdb_thread_db.h
+++ b/gdb/nat/gdb_thread_db.h
@@ -1,3 +1,23 @@
+/* Copyright (C) 2000-2015 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   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 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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef GDB_THREAD_DB_H
+#define GDB_THREAD_DB_H 1
+
 #ifdef HAVE_THREAD_DB_H
 #include <thread_db.h>
 #else
@@ -52,3 +72,5 @@ typedef td_err_e (td_thr_tlsbase_ftype) (const td_thrhandle_t *th,
 
 typedef const char ** (td_symbol_list_ftype) (void);
 typedef td_err_e (td_ta_delete_ftype) (td_thragent_t *);
+
+#endif /* GDB_THREAD_DB_H */


-- 
  Dr. Ulrich Weigand
  GNU/Linux compilers and toolchain
  Ulrich.Weigand@de.ibm.com