diff options
| -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 fa664e4bc00..5ec38e71b7c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2009-07-23 Yavor Doganov <yavor@gnu.org> | ||
| 2 | |||
| 3 | * nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep. | ||
| 4 | |||
| 1 | 2009-07-23 Adrian Robert <Adrian.B.Robert@gmail.com> | 5 | 2009-07-23 Adrian Robert <Adrian.B.Robert@gmail.com> |
| 2 | 6 | ||
| 3 | * nsterm.m (EmacsView-keyUp:): Only act when running under Tiger. | 7 | * nsterm.m (EmacsView-keyUp:): Only act when running under Tiger. |
diff --git a/src/nsfont.m b/src/nsfont.m index 788056dba83..33bbe37ab65 100644 --- a/src/nsfont.m +++ b/src/nsfont.m | |||
| @@ -37,6 +37,11 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu) | |||
| 37 | #include "character.h" | 37 | #include "character.h" |
| 38 | #include "font.h" | 38 | #include "font.h" |
| 39 | 39 | ||
| 40 | /* This header is not included from GNUstep's (0.16.0) AppKit.h. */ | ||
| 41 | #ifdef NS_IMPL_GNUSTEP | ||
| 42 | #import <AppKit/NSFontDescriptor.h> | ||
| 43 | #endif | ||
| 44 | |||
| 40 | #define NSFONT_TRACE 0 | 45 | #define NSFONT_TRACE 0 |
| 41 | 46 | ||
| 42 | extern Lisp_Object Qns; | 47 | extern Lisp_Object Qns; |