[Emacs-diffs] /srv/bzr/emacs/trunk r105035: * nsgui.h: Fix compiler warning about gnulib redefining verify.

[Jan D.]

------------------------------------------------------------
revno: 105035
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-08 10:42:58 +0200
message:
  * nsgui.h: Fix compiler warning about gnulib redefining verify.
modified:
  src/ChangeLog
  src/nsgui.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-08 08:11:35 +0000
+++ b/src/ChangeLog     2011-07-08 08:42:58 +0000
@@ -1,5 +1,7 @@
 2011-07-08  Jan Djärv  <address@hidden>
 
+       * nsgui.h: Fix compiler warning about gnulib redefining verify.
+
        * nsselect.m (ns_get_local_selection): Change to extern (Bug#8842).
 
        * nsmenu.m (ns_update_menubar): Remove useless setDelegate call

=== modified file 'src/nsgui.h'
--- a/src/nsgui.h       2011-01-25 04:08:28 +0000
+++ b/src/nsgui.h       2011-07-08 08:42:58 +0000
@@ -30,6 +30,8 @@
 #undef init_process
 #endif  /* NS_IMPL_COCOA */
 
+#undef verify
+
 #import <AppKit/AppKit.h>
 
 #ifdef NS_IMPL_COCOA
@@ -44,6 +46,9 @@
 
 #endif /* __OBJC__ */
 
+#undef verify
+#undef _GL_VERIFY_H
+#include <verify.h>
 
 /* menu-related */
 #define free_widget_value(wv) xfree (wv)