diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-07-23 14:42:45 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-07-23 14:42:45 +0000 |
| commit | 85e221b2b8718c1ea9b2bfddad69a98dd5deeaa5 (patch) | |
| tree | 1a7b29706a1f700358bf1396b79875ba1de2537e | |
| parent | bd4303c263dcbbae550a04368284247064943bb7 (diff) | |
| download | emacs-85e221b2b8718c1ea9b2bfddad69a98dd5deeaa5.tar.gz | |
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsfont.m | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ae79ce7deae..3295afcfad1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-07-23 Yavor Doganov <yavor@gnu.org> + + * nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep. + 2009-07-23 Adrian Robert <Adrian.B.Robert@gmail.com> * nsterm.m (EmacsView-keyUp:): Only act when running under Tiger. diff --git a/src/nsfont.m b/src/nsfont.m index bf117fe1c9d..032ea39aef4 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -37,6 +37,11 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu) #include "character.h" #include "font.h" +/* This header is not included from GNUstep's (0.16.0) AppKit.h. */ +#ifdef NS_IMPL_GNUSTEP +#import <AppKit/NSFontDescriptor.h> +#endif + #define NSFONT_TRACE 0 extern Lisp_Object Qns; |