Merge GDB 7.5.1

gdb/gnulib/import/extra/snippet/c++defs.h

Index: gdb/gnulib/import/extra/snippet/c++defs.h
diff --git a/gdb/gnulib/extra/c++defs.h b/gdb/gnulib/import/extra/snippet/c++defs.h
similarity index 99%
rename from gdb/gnulib/extra/c++defs.h
rename to gdb/gnulib/import/extra/snippet/c++defs.h
index cc6a6a437e952c3198f873b7408d94984202f9d0..96da94b97b69693221c33607419d5f05db409baa 100644
--- a/gdb/gnulib/extra/c++defs.h
+++ b/gdb/gnulib/import/extra/snippet/c++defs.h
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
@@ -9,7 +9,7 @@
    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
-   Lesser General Public License for more details.
+   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/>.  */