diff options
| author | Joakim Verona | 2011-07-15 04:39:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-15 04:39:29 +0200 |
| commit | 4f616a2e7ed1db28da98df90266e9751a8ae9ee1 (patch) | |
| tree | 74a9dcbe13e945e712ae04a4a94c2202ca720591 /src/nsgui.h | |
| parent | ff2be00005c3aeda6e11d7ed264ce86f02b60958 (diff) | |
| parent | ec2bc542a4d0127425625e8cb458684bd825675a (diff) | |
| download | emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.tar.gz emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.zip | |
merge from upstream
Diffstat (limited to 'src/nsgui.h')
| -rw-r--r-- | src/nsgui.h | 5 |
1 files changed, 5 insertions, 0 deletions
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) |