aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsmenu.m
diff options
context:
space:
mode:
authorJan Djärv2013-09-22 16:26:10 +0200
committerJan Djärv2013-09-22 16:26:10 +0200
commitfb83ea63a5db0fe6c20667532d1019a58d2fc1fd (patch)
treeafed6f0f68dc9362e1547f62ddfc763994a76f8c /src/nsmenu.m
parent69b3debcd2359d53a074a781ac74101142c03191 (diff)
downloademacs-fb83ea63a5db0fe6c20667532d1019a58d2fc1fd.tar.gz
emacs-fb83ea63a5db0fe6c20667532d1019a58d2fc1fd.zip
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/nsmenu.m')
-rw-r--r--src/nsmenu.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m
index f9cd511efe9..8dde027e986 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1239,7 +1239,7 @@ update_frame_tool_bar (struct frame *f)
1239{ 1239{
1240 /* 1) come up w/identifier */ 1240 /* 1) come up w/identifier */
1241 NSString *identifier 1241 NSString *identifier
1242 = [NSString stringWithFormat: @"%u", [img hash]]; 1242 = [NSString stringWithFormat: @"%lu", (unsigned long)[img hash]];
1243 [activeIdentifiers addObject: identifier]; 1243 [activeIdentifiers addObject: identifier];
1244 1244
1245 /* 2) create / reuse item */ 1245 /* 2) create / reuse item */