diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2011-07-08 10:42:58 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-07-08 10:42:58 +0200 |
| commit | a63e0781250f31d99360209d9053d380d6fe0815 (patch) | |
| tree | 6b15fda311c719d3a3c0e446ce4360f7ec005fdf | |
| parent | 699c10bd69f9395a5705b86259b957b7ed75f8ef (diff) | |
| download | emacs-a63e0781250f31d99360209d9053d380d6fe0815.tar.gz | |
* nsgui.h: Fix compiler warning about gnulib redefining verify.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/nsgui.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c925b323499..3c718c078d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-07-08 Jan Djärv <jan.h.d@swipnet.se> + * 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 diff --git a/src/nsgui.h b/src/nsgui.h index a6955630941..999dc27e310 100644 --- a/src/nsgui.h +++ b/src/nsgui.h @@ -30,6 +30,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef init_process #endif /* NS_IMPL_COCOA */ +#undef verify + #import <AppKit/AppKit.h> #ifdef NS_IMPL_COCOA @@ -44,6 +46,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #endif /* __OBJC__ */ +#undef verify +#undef _GL_VERIFY_H +#include <verify.h> /* menu-related */ #define free_widget_value(wv) xfree (wv) |