[Emacs-diffs] trunk r114431: Fix compiler warnings from XCode 5.0 on OSX.

[Jan D.]

------------------------------------------------------------
revno: 114431
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-22 16:26:10 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfont.m                   nsfont.m-20091113204419-o5vbwnq5f7feedwu-8748
  src/nsmenu.m                   nsmenu.m-20091113204419-o5vbwnq5f7feedwu-8744
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
  src/process.c                  process.c-20091113204419-o5vbwnq5f7feedwu-462

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-22 11:07:17 +0000
+++ b/src/ChangeLog     2013-09-22 14:26:10 +0000
@@ -1,5 +1,15 @@
 2013-09-22  Jan Djärv  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2013-09-15 17:58:46 +0000
+++ b/src/nsfont.m      2013-09-22 14:26:10 +0000
@@ -526,7 +526,7 @@
       }
 
     if (NSFONT_TRACE)
-       NSLog(@"    returning %d families", [families count]);
+      NSLog(@"    returning %lu families", (unsigned long)[families count]);
     return families;
 }
 
@@ -564,8 +564,8 @@
     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 @@
 
     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);

=== modified file 'src/nsmenu.m'
--- a/src/nsmenu.m      2013-08-27 18:47:55 +0000
+++ b/src/nsmenu.m      2013-09-22 14:26:10 +0000
@@ -1239,7 +1239,7 @@
 {
   /* 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 */

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-09-19 07:48:53 +0000
+++ b/src/nsterm.m      2013-09-22 14:26:10 +0000
@@ -5208,8 +5208,10 @@
   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 @@
   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;

=== modified file 'src/process.c'
--- a/src/process.c     2013-09-20 15:34:36 +0000
+++ b/src/process.c     2013-09-22 14:26:10 +0000
@@ -4847,7 +4847,7 @@
 #else
              {
                struct sockaddr pname;
-               int pnamelen = sizeof (pname);
+               socklen_t pnamelen = sizeof (pname);
 
                /* If connection failed, getpeername will fail.  */
                xerrno = 0;