From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 22 Jul 2012 04:16:53 +0000 (-0700)
Subject: Merge from gnulib (comment changes only).
X-Git-Tag: emacs-24.2.90~1103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=894bd8732db202ab5a2dd43cd0e949289b20c3f5;p=emacs.git

Merge from gnulib (comment changes only).
---

diff --git a/lib/verify.h b/lib/verify.h
index cef14ad1571..0c320b19ad4 100644
--- a/lib/verify.h
+++ b/lib/verify.h
@@ -125,7 +125,7 @@
        extern int (*dummy (void)) [sizeof (struct {...})];
 
    * GCC warns about duplicate declarations of the dummy function if
-     -Wredundant_decls is used.  GCC 4.3 and later have a builtin
+     -Wredundant-decls is used.  GCC 4.3 and later have a builtin
      __COUNTER__ macro that can let us generate unique identifiers for
      each dummy function, to suppress this warning.
 
@@ -133,6 +133,10 @@
      which do not support _Static_assert, also do not warn about the
      last declaration mentioned above.
 
+   * GCC warns if -Wnested-externs is enabled and verify() is used
+     within a function body; but inside a function, you can always
+     arrange to use verify_expr() instead.
+
    * In C++, any struct definition inside sizeof is invalid.
      Use a template type to work around the problem.  */