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.

diff --git a/src/ChangeLog b/src/ChangeLog
index e6901fd86804b680f470fb49f1bc0f4c6989d6ca..a466047718fef9eca52f251e4c9bd47dfff2b17f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>

diff --git a/src/nsfont.m b/src/nsfont.m
index d9c8660f1cd72122e8638d61189678863a4e10ce..bd9a2acc983eac2881dbd4c872be2115056c28db 100644 (file)
--- 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);

diff --git a/src/nsmenu.m b/src/nsmenu.m
index f9cd511efe9b6fee5d66122d9b4c5fa693a8597b..8dde027e98693b2c4aba44cca0ab5d04ae87426f 100644 (file)
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1239,7 +1239,7 @@ update_frame_tool_bar (struct frame *f)
 {
   /* 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 */

diff --git a/src/nsterm.m b/src/nsterm.m
index 5c9800f5416be658cf52cbbf14aa27d8452103ad..65c67eb9b56d9d16a084d5b9c22624fe47c36c97 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5208,8 +5208,10 @@ not_in_argv (NSString *arg)
   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 @@ not_in_argv (NSString *arg)
   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;

diff --git a/src/process.c b/src/process.c
index 0f53577331dc88dc5ca8ba9400e811f42043c5e3..94f59942a610553b18a44b86f67cd99b68ed5cbf 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -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;