diff options
| author | Jan Djärv | 2011-07-08 10:42:58 +0200 |
|---|---|---|
| committer | Jan Djärv | 2011-07-08 10:42:58 +0200 |
| commit | a63e0781250f31d99360209d9053d380d6fe0815 (patch) | |
| tree | 6b15fda311c719d3a3c0e446ce4360f7ec005fdf /src | |
| parent | 699c10bd69f9395a5705b86259b957b7ed75f8ef (diff) | |
| download | emacs-a63e0781250f31d99360209d9053d380d6fe0815.tar.gz emacs-a63e0781250f31d99360209d9053d380d6fe0815.zip | |
* nsgui.h: Fix compiler warning about gnulib redefining verify.
Diffstat (limited to 'src')
| -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 @@ | |||
| 1 | 2011-07-08 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2011-07-08 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * nsgui.h: Fix compiler warning about gnulib redefining verify. | ||
| 4 | |||
| 3 | * nsselect.m (ns_get_local_selection): Change to extern (Bug#8842). | 5 | * nsselect.m (ns_get_local_selection): Change to extern (Bug#8842). |
| 4 | 6 | ||
| 5 | * nsmenu.m (ns_update_menubar): Remove useless setDelegate call | 7 | * 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/>. */ | |||
| 30 | #undef init_process | 30 | #undef init_process |
| 31 | #endif /* NS_IMPL_COCOA */ | 31 | #endif /* NS_IMPL_COCOA */ |
| 32 | 32 | ||
| 33 | #undef verify | ||
| 34 | |||
| 33 | #import <AppKit/AppKit.h> | 35 | #import <AppKit/AppKit.h> |
| 34 | 36 | ||
| 35 | #ifdef NS_IMPL_COCOA | 37 | #ifdef NS_IMPL_COCOA |
| @@ -44,6 +46,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 44 | 46 | ||
| 45 | #endif /* __OBJC__ */ | 47 | #endif /* __OBJC__ */ |
| 46 | 48 | ||
| 49 | #undef verify | ||
| 50 | #undef _GL_VERIFY_H | ||
| 51 | #include <verify.h> | ||
| 47 | 52 | ||
| 48 | /* menu-related */ | 53 | /* menu-related */ |
| 49 | #define free_widget_value(wv) xfree (wv) | 54 | #define free_widget_value(wv) xfree (wv) |