[Emacs-diffs] emacs/src ChangeLog nsfont.m [EMACS_23_1_RC]

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Adrian Robert <arobert> 09/07/23 14:42:47

Modified files:
        src            : ChangeLog nsfont.m 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.31&r2=1.7586.2.32
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.26.2.2&r2=1.26.2.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.31
retrieving revision 1.7586.2.32
diff -u -b -r1.7586.2.31 -r1.7586.2.32
--- ChangeLog   23 Jul 2009 13:21:07 -0000      1.7586.2.31
+++ ChangeLog   23 Jul 2009 14:42:45 -0000      1.7586.2.32
@@ -1,3 +1,7 @@
+2009-07-23  Yavor Doganov  <address@hidden>
+
+       * nsfont.m (NSFontDescriptor.h): Explicitly include under GNUstep.
+
 2009-07-23  Adrian Robert  <address@hidden>
 
        * nsterm.m (EmacsView-keyUp:): Only act when running under Tiger.

Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -u -b -r1.26.2.2 -r1.26.2.3
--- nsfont.m    15 Jul 2009 08:25:49 -0000      1.26.2.2
+++ nsfont.m    23 Jul 2009 14:42:47 -0000      1.26.2.3
@@ -37,6 +37,11 @@
 #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;