diff options
| author | Eli Zaretskii | 2018-06-16 14:16:53 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2018-06-16 14:16:53 +0300 |
| commit | 34e257f83a22093cc8dd7a6cd8a4707123f5af77 (patch) | |
| tree | 1b7f6cc28109b204186ba3da499602a1c5cb1ebb /src | |
| parent | e0f7c49823bcb3c569f7334355e4fac8ba7061f7 (diff) | |
| download | emacs-34e257f83a22093cc8dd7a6cd8a4707123f5af77.tar.gz emacs-34e257f83a22093cc8dd7a6cd8a4707123f5af77.zip | |
Use mint_ptr in w32notify.c
* src/w32notify.c (Fw32notify_add_watch, Fw32notify_rm_watch)
(Fw32notify_valid_p, w32_get_watch_object): Use make_mint_ptr and
xmint_pointer.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32notify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32notify.c b/src/w32notify.c index 5c1d2120543..67385b80a81 100644 --- a/src/w32notify.c +++ b/src/w32notify.c | |||
| @@ -622,7 +622,7 @@ generate notifications correctly, though. */) | |||
| 622 | report_file_notify_error ("Cannot watch file", Fcons (file, Qnil)); | 622 | report_file_notify_error ("Cannot watch file", Fcons (file, Qnil)); |
| 623 | } | 623 | } |
| 624 | /* Store watch object in watch list. */ | 624 | /* Store watch object in watch list. */ |
| 625 | watch_descriptor = make_pointer_integer (dirwatch); | 625 | watch_descriptor = make_mint_ptr (dirwatch); |
| 626 | watch_object = Fcons (watch_descriptor, callback); | 626 | watch_object = Fcons (watch_descriptor, callback); |
| 627 | watch_list = Fcons (watch_object, watch_list); | 627 | watch_list = Fcons (watch_object, watch_list); |
| 628 | 628 | ||
| @@ -647,7 +647,7 @@ WATCH-DESCRIPTOR should be an object returned by `w32notify-add-watch'. */) | |||
| 647 | if (!NILP (watch_object)) | 647 | if (!NILP (watch_object)) |
| 648 | { | 648 | { |
| 649 | watch_list = Fdelete (watch_object, watch_list); | 649 | watch_list = Fdelete (watch_object, watch_list); |
| 650 | dirwatch = (struct notification *)XINTPTR (watch_descriptor); | 650 | dirwatch = (struct notification *)xmint_pointer (watch_descriptor); |
| 651 | if (w32_valid_pointer_p (dirwatch, sizeof(struct notification))) | 651 | if (w32_valid_pointer_p (dirwatch, sizeof(struct notification))) |
| 652 | status = remove_watch (dirwatch); | 652 | status = remove_watch (dirwatch); |
| 653 | } | 653 | } |
| @@ -662,7 +662,7 @@ WATCH-DESCRIPTOR should be an object returned by `w32notify-add-watch'. */) | |||
| 662 | Lisp_Object | 662 | Lisp_Object |
| 663 | w32_get_watch_object (void *desc) | 663 | w32_get_watch_object (void *desc) |
| 664 | { | 664 | { |
| 665 | Lisp_Object descriptor = make_pointer_integer (desc); | 665 | Lisp_Object descriptor = make_mint_ptr (desc); |
| 666 | 666 | ||
| 667 | /* This is called from the input queue handling code, inside a | 667 | /* This is called from the input queue handling code, inside a |
| 668 | critical section, so we cannot possibly quit if watch_list is not | 668 | critical section, so we cannot possibly quit if watch_list is not |
| @@ -685,7 +685,7 @@ watch by calling `w32notify-rm-watch' also makes it invalid. */) | |||
| 685 | if (!NILP (watch_object)) | 685 | if (!NILP (watch_object)) |
| 686 | { | 686 | { |
| 687 | struct notification *dirwatch = | 687 | struct notification *dirwatch = |
| 688 | (struct notification *)XINTPTR (watch_descriptor); | 688 | (struct notification *)xmint_pointer (watch_descriptor); |
| 689 | if (w32_valid_pointer_p (dirwatch, sizeof(struct notification)) | 689 | if (w32_valid_pointer_p (dirwatch, sizeof(struct notification)) |
| 690 | && dirwatch->dir != NULL) | 690 | && dirwatch->dir != NULL) |
| 691 | return Qt; | 691 | return Qt; |