From 988c07dff201e8c6471930a33e2a1069550784e1 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 9 Feb 2011 19:16:11 -0800
Subject: [PATCH] * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.

---
 ChangeLog     | 7 +++++++
 arg-nonnull.h | 2 +-
 c++defs.h     | 2 +-
 warn-on-use.h | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d75ec5150f7..2a0dd144670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
+	Sync from gnulib, which has been patched to fix the problem
+	with the license notices.  Problem reported by Glenn Morris in
+	<http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00403.html>.
+
 2011-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* .bzrignore: Ignore globals.h and related stamp.
diff --git a/arg-nonnull.h b/arg-nonnull.h
index 226d1a86998..6c2f1e82d06 100644
--- a/arg-nonnull.h
+++ b/arg-nonnull.h
@@ -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/>.  */
diff --git a/c++defs.h b/c++defs.h
index d521417069a..b6821a64ac4 100644
--- a/c++defs.h
+++ b/c++defs.h
@@ -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/>.  */
diff --git a/warn-on-use.h b/warn-on-use.h
index fdf250e9f40..2cdeec3e663 100644
--- a/warn-on-use.h
+++ b/warn-on-use.h
@@ -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/>.  */
-- 
2.39.5