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.
This commit is contained in:
parent
69b3debcd2
commit
fb83ea63a5
5 changed files with 23 additions and 9 deletions
|
@ -1,5 +1,15 @@
|
|||
2013-09-22 Jan Djärv <jan.h.d@swipnet.se>
|
||||
|
||||
* process.c (wait_reading_process_output): Change int pnamelen to
|
||||
socklen_t.
|
||||
|
||||
* 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).
|
||||
|
||||
* conf_post.h (assume): Fix compiler error: x shall be cond.
|
||||
|
||||
2013-09-22 Daniel Colascione <dancol@dancol.org>
|
||||
|
|
10
src/nsfont.m
10
src/nsfont.m
|
@ -526,7 +526,7 @@ but also for ascii (which causes unnecessary font substitution). */
|
|||
}
|
||||
|
||||
if (NSFONT_TRACE)
|
||||
NSLog(@" returning %d families", [families count]);
|
||||
NSLog(@" returning %lu families", (unsigned long)[families count]);
|
||||
return families;
|
||||
}
|
||||
|
||||
|
@ -564,8 +564,8 @@ but also for ascii (which causes unnecessary font substitution). */
|
|||
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 @@ is false when (FROM > 0 || TO < S->nchars). */
|
|||
|
||||
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);
|
||||
|
|
|
@ -1239,7 +1239,7 @@ - (void) addDisplayItemWithImage: (EmacsImage *)img
|
|||
{
|
||||
/* 1) come up w/identifier */
|
||||
NSString *identifier
|
||||
= [NSString stringWithFormat: @"%u", [img hash]];
|
||||
= [NSString stringWithFormat: @"%lu", (unsigned long)[img hash]];
|
||||
[activeIdentifiers addObject: identifier];
|
||||
|
||||
/* 2) create / reuse item */
|
||||
|
|
|
@ -5208,8 +5208,10 @@ - (void)setMarkedText: (id)aString selectedRange: (NSRange)selRange
|
|||
NSString *str = [aString respondsToSelector: @selector (string)] ?
|
||||
[aString string] : aString;
|
||||
if (NS_KEYLOG)
|
||||
NSLog (@"setMarkedText '%@' len =%d range %d from %d", str, [str length],
|
||||
selRange.length, selRange.location);
|
||||
NSLog (@"setMarkedText '%@' len =%lu range %lu from %lu",
|
||||
str, (unsigned long)[str length],
|
||||
(unsigned long)selRange.length,
|
||||
(unsigned long)selRange.location);
|
||||
|
||||
if (workingText != nil)
|
||||
[self deleteWorkingText];
|
||||
|
@ -5235,7 +5237,7 @@ - (void)deleteWorkingText
|
|||
if (workingText == nil)
|
||||
return;
|
||||
if (NS_KEYLOG)
|
||||
NSLog(@"deleteWorkingText len =%d\n", [workingText length]);
|
||||
NSLog(@"deleteWorkingText len =%lu\n", (unsigned long)[workingText length]);
|
||||
[workingText release];
|
||||
workingText = nil;
|
||||
processingCompose = NO;
|
||||
|
|
|
@ -4847,7 +4847,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
|
|||
#else
|
||||
{
|
||||
struct sockaddr pname;
|
||||
int pnamelen = sizeof (pname);
|
||||
socklen_t pnamelen = sizeof (pname);
|
||||
|
||||
/* If connection failed, getpeername will fail. */
|
||||
xerrno = 0;
|
||||
|
|
Loading…
Add table
Reference in a new issue