diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-22 16:26:10 +0200 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-22 16:26:10 +0200 |
commit | fb83ea63a5db0fe6c20667532d1019a58d2fc1fd (patch) | |
tree | afed6f0f68dc9362e1547f62ddfc763994a76f8c /src/nsfont.m | |
parent | 69b3debcd2359d53a074a781ac74101142c03191 (diff) | |
download | emacs-fb83ea63a5db0fe6c20667532d1019a58d2fc1fd.tar.gz |
Fix compiler warnings from XCode 5.0 on OSX.
* nsterm.m (setMarkedText:selectedRange:):
(deleteWorkingText):
* nsmenu.m (addDisplayItemWithImage:idx:tag:helpText:enabled:):
* nsfont.m (ns_get_covering_families, ns_findfonts): Cast NSLog
argument to unsigned long to avoid warning.
(nsfont_draw): Use 0.25 instead of Fix2X (kATSItalicQDSkew).
* process.c (wait_reading_process_output): Change int pnamelen to
socklen_t.
Diffstat (limited to 'src/nsfont.m')
-rw-r--r-- | src/nsfont.m | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nsfont.m b/src/nsfont.m index d9c8660f1cd..bd9a2acc983 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -526,7 +526,7 @@ static NSSet } if (NSFONT_TRACE) - NSLog(@" returning %d families", [families count]); + NSLog(@" returning %lu families", (unsigned long)[families count]); return families; } @@ -564,8 +564,8 @@ ns_findfonts (Lisp_Object font_spec, BOOL isMatch) matchingDescs = [fdesc matchingFontDescriptorsWithMandatoryKeys: fkeys]; if (NSFONT_TRACE) - NSLog(@"Got desc %@ and found %d matching fonts from it: ", fdesc, - [matchingDescs count]); + NSLog(@"Got desc %@ and found %lu matching fonts from it: ", fdesc, + (unsigned long)[matchingDescs count]); for (dEnum = [matchingDescs objectEnumerator]; (desc = [dEnum nextObject]);) { @@ -1249,7 +1249,9 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, CGContextSaveGState (gcontext); - fliptf.c = font->synthItal ? Fix2X (kATSItalicQDSkew) : 0.0; + // Used to be Fix2X (kATSItalicQDSkew), but Fix2X is deprecated + // and kATSItalicQDSkew is 0.25. + fliptf.c = font->synthItal ? 0.25 : 0.0; CGContextSetFont (gcontext, font->cgfont); CGContextSetFontSize (gcontext, font->size); |