diff options
| author | Eli Zaretskii | 2013-09-26 10:37:16 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-09-26 10:37:16 +0300 |
| commit | b87c4ff2817e71ca71b028792200b1e069a95e04 (patch) | |
| tree | bfe00c0655fa02078a9ab2c633ea06d90c4a2064 /src/nsmenu.m | |
| parent | bbc108377873aa6ed7cf21c731770103096eea39 (diff) | |
| parent | ba355de014b75ed104da4777f909db70d62f2357 (diff) | |
| download | emacs-b87c4ff2817e71ca71b028792200b1e069a95e04.tar.gz emacs-b87c4ff2817e71ca71b028792200b1e069a95e04.zip | |
Merge from trunk.
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 697329df675..3ed1734d222 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -1242,7 +1242,7 @@ update_frame_tool_bar (struct frame *f) | |||
| 1242 | { | 1242 | { |
| 1243 | /* 1) come up w/identifier */ | 1243 | /* 1) come up w/identifier */ |
| 1244 | NSString *identifier | 1244 | NSString *identifier |
| 1245 | = [NSString stringWithFormat: @"%u", [img hash]]; | 1245 | = [NSString stringWithFormat: @"%lu", (unsigned long)[img hash]]; |
| 1246 | [activeIdentifiers addObject: identifier]; | 1246 | [activeIdentifiers addObject: identifier]; |
| 1247 | 1247 | ||
| 1248 | /* 2) create / reuse item */ | 1248 | /* 2) create / reuse item */ |