diff options
| author | Eli Zaretskii | 2017-04-04 17:56:10 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-04-04 17:56:10 +0300 |
| commit | 12317ff4fb53f889a69a858a629df6beffacd051 (patch) | |
| tree | 1877d1d2a98f773873cc7058c2570edfba09ac02 /src/alloc.c | |
| parent | 604eb02fff061e663e7523f45a72ecb71c2061e1 (diff) | |
| download | emacs-12317ff4fb53f889a69a858a629df6beffacd051.tar.gz emacs-12317ff4fb53f889a69a858a629df6beffacd051.zip | |
Fix recent changes in record data type
* src/alloc.c (Fmake_record, Frecord, Fcopy_record): Avoid
compiler warnings when 'ptrdiff_t' is narrower than 'long int'.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/alloc.c b/src/alloc.c index fe631f2e4d8..5024b1211e5 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -3424,7 +3424,7 @@ type slot, must fit in PSEUDOVECTOR_SIZE_BITS. */) | |||
| 3424 | size = XFASTINT (slots) + 1; | 3424 | size = XFASTINT (slots) + 1; |
| 3425 | p = allocate_record (size); | 3425 | p = allocate_record (size); |
| 3426 | if (p == NULL) | 3426 | if (p == NULL) |
| 3427 | error ("Attempt to allocate a record of %ld slots; max is %d", | 3427 | error ("Attempt to allocate a record of %"pD"d slots; max is %d", |
| 3428 | size, (1 << PSEUDOVECTOR_SIZE_BITS) - 1); | 3428 | size, (1 << PSEUDOVECTOR_SIZE_BITS) - 1); |
| 3429 | 3429 | ||
| 3430 | p->contents[0] = type; | 3430 | p->contents[0] = type; |
| @@ -3447,7 +3447,7 @@ usage: (record TYPE &rest SLOTS) */) | |||
| 3447 | { | 3447 | { |
| 3448 | struct Lisp_Vector *p = allocate_record (nargs); | 3448 | struct Lisp_Vector *p = allocate_record (nargs); |
| 3449 | if (p == NULL) | 3449 | if (p == NULL) |
| 3450 | error ("Attempt to allocate a record of %ld slots; max is %d", | 3450 | error ("Attempt to allocate a record of %"pD"d slots; max is %d", |
| 3451 | nargs, (1 << PSEUDOVECTOR_SIZE_BITS) - 1); | 3451 | nargs, (1 << PSEUDOVECTOR_SIZE_BITS) - 1); |
| 3452 | 3452 | ||
| 3453 | Lisp_Object type = args[0]; | 3453 | Lisp_Object type = args[0]; |
| @@ -3470,7 +3470,7 @@ DEFUN ("copy-record", Fcopy_record, Scopy_record, 1, 1, 0, | |||
| 3470 | ptrdiff_t size = ASIZE (record) & PSEUDOVECTOR_SIZE_MASK; | 3470 | ptrdiff_t size = ASIZE (record) & PSEUDOVECTOR_SIZE_MASK; |
| 3471 | struct Lisp_Vector *new = allocate_record (size); | 3471 | struct Lisp_Vector *new = allocate_record (size); |
| 3472 | if (new == NULL) | 3472 | if (new == NULL) |
| 3473 | error ("Attempt to allocate a record of %ld slots; max is %d", | 3473 | error ("Attempt to allocate a record of %"pD"d slots; max is %d", |
| 3474 | size, (1 << PSEUDOVECTOR_SIZE_BITS) - 1); | 3474 | size, (1 << PSEUDOVECTOR_SIZE_BITS) - 1); |
| 3475 | 3475 | ||
| 3476 | memcpy (&(new->contents[0]), &(src->contents[0]), | 3476 | memcpy (&(new->contents[0]), &(src->contents[0]), |