aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdrian Robert2009-07-23 14:41:05 +0000
committerAdrian Robert2009-07-23 14:41:05 +0000
commit4e2f36cfedaac888d4867482f3e83fa5ba635d19 (patch)
tree2c7cd61d1a46f2be76cacee827b4073bf6ddbe9b /src
parent7f6ad209681d518fdddddb8dc7ca34316cfae4db (diff)
downloademacs-4e2f36cfedaac888d4867482f3e83fa5ba635d19.tar.gz
emacs-4e2f36cfedaac888d4867482f3e83fa5ba635d19.zip
* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/nsfont.m5
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 @@
12009-07-23 Yavor Doganov <yavor@gnu.org>
2
3 * nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
4
12009-07-23 Adrian Robert <Adrian.B.Robert@gmail.com> 52009-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
42extern Lisp_Object Qns; 47extern Lisp_Object Qns;