From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Thu, 23 Jul 2009 14:41:05 +0000 (+0000)
Subject: * nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
X-Git-Tag: emacs-pretest-23.1.90~2042
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e2f36cfedaac888d4867482f3e83fa5ba635d19;p=emacs.git

* nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index fa664e4bc00..5ec38e71b7c 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 788056dba83..33bbe37ab65 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;