diff options
| author | Paul Eggert | 2011-09-27 09:02:05 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-27 09:02:05 -0700 |
| commit | 17fdb2228b820dc577ff61b03876117eba5226d1 (patch) | |
| tree | 5280be4426e3569af0bbb760b92dbb77daf3e772 /src | |
| parent | 88cc3dabc9308cba0d43b9afa393ec8eb285ed7c (diff) | |
| download | emacs-17fdb2228b820dc577ff61b03876117eba5226d1.tar.gz emacs-17fdb2228b820dc577ff61b03876117eba5226d1.zip | |
* nsselect.m (clean_local_selection_data): Use ptrdiff_t, not int.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/nsselect.m | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 52514d36429..99d645c0568 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -528,7 +528,7 @@ | |||
| 528 | Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts. | 528 | Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts. |
| 529 | (ns_update_menubar): Use intptr_t, not EMACS_INT, when intptr_t is | 529 | (ns_update_menubar): Use intptr_t, not EMACS_INT, when intptr_t is |
| 530 | wide enough. | 530 | wide enough. |
| 531 | * nsselect.m (ns_get_local_selection): | 531 | * nsselect.m (ns_get_local_selection, clean_local_selection_data): |
| 532 | Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts. | 532 | Use ptrdiff_t, not int, to avoid needless 32-bit limit on 64-bit hosts. |
| 533 | * print.c (print_buffer_size, print_buffer_pos, print_buffer_pos_byte) | 533 | * print.c (print_buffer_size, print_buffer_pos, print_buffer_pos_byte) |
| 534 | (PRINTDECLARE, PRINTPREPARE): | 534 | (PRINTDECLARE, PRINTPREPARE): |
diff --git a/src/nsselect.m b/src/nsselect.m index 655fedc640c..9f6f35968f5 100644 --- a/src/nsselect.m +++ b/src/nsselect.m | |||
| @@ -109,8 +109,8 @@ clean_local_selection_data (Lisp_Object obj) | |||
| 109 | 109 | ||
| 110 | if (VECTORP (obj)) | 110 | if (VECTORP (obj)) |
| 111 | { | 111 | { |
| 112 | int i; | 112 | ptrdiff_t i; |
| 113 | int size = ASIZE (obj); | 113 | ptrdiff_t size = ASIZE (obj); |
| 114 | Lisp_Object copy; | 114 | Lisp_Object copy; |
| 115 | 115 | ||
| 116 | if (size == 1) | 116 | if (size == 1) |
| @@ -353,7 +353,7 @@ ns_string_from_pasteboard (id pb) | |||
| 353 | length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; | 353 | length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; |
| 354 | 354 | ||
| 355 | #if ! defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 | 355 | #if ! defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 |
| 356 | if (!utfStr) | 356 | if (!utfStr) |
| 357 | { | 357 | { |
| 358 | utfStr = [mstr cString]; | 358 | utfStr = [mstr cString]; |
| 359 | length = strlen (utfStr); | 359 | length = strlen (utfStr); |
| @@ -621,4 +621,3 @@ The functions are called with one argument, the selection type\n\ | |||
| 621 | Qforeign_selection = intern_c_string ("foreign-selection"); | 621 | Qforeign_selection = intern_c_string ("foreign-selection"); |
| 622 | staticpro (&Qforeign_selection); | 622 | staticpro (&Qforeign_selection); |
| 623 | } | 623 | } |
| 624 | |||