diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-08-29 08:18:41 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2008-08-29 08:18:41 +0000 |
| commit | fa79be7e04de685abe4e22f9daa175623c7a2a55 (patch) | |
| tree | 6b9bb69935edf87a1a855ce58267b9a5ae02c8d2 | |
| parent | 82f9c4e86e37a03e915225543ead081961605946 (diff) | |
| download | emacs-fa79be7e04de685abe4e22f9daa175623c7a2a55.tar.gz | |
(Fmac_resume_apple_event): Distribute cast to pointer
over conditional branches.
| -rw-r--r-- | src/ChangeLog | 12 | ||||
| -rw-r--r-- | src/macselect.c | 7 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e6f71cb9297..3faea824ff0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2008-08-29 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * mac.c (mac_system_script_code): Use EMACS_INT for DEFVAR_INT variable. + [MAC_OSX] (mac_try_close_socket, sys_select) [SELECT_USE_CFSOCKET]: + Cast to pointer-size integer before casting to pointer. + + * macmenu.c [HAVE_DIALOGS] (mac_dialog_show): Cast to pointer-size + integer before casting to pointer. + + * macselect.c (Fmac_resume_apple_event): Distribute cast to pointer + over conditional branches. + 2008-08-26 Chong Yidong <cyd@stupidchicken.com> * eval.c (Fcondition_case): Doc fix. diff --git a/src/macselect.c b/src/macselect.c index df7e98c0d67..ccacc65c7fe 100644 --- a/src/macselect.c +++ b/src/macselect.c @@ -1041,10 +1041,9 @@ nil, which means the event is already resumed or expired. */) } AESetTheCurrentEvent (&ae->apple_event); AEResumeTheCurrentEvent (&ae->apple_event, &ae->reply, - ((AEEventHandlerUPP) - (EQ (error_code, Qt) ? - kAEUseStandardDispatch : kAENoDispatch)), - 0); + (EQ (error_code, Qt) + ? (AEEventHandlerUPP) kAEUseStandardDispatch + : (AEEventHandlerUPP) kAENoDispatch), 0); AEDisposeDesc (&ae->reply); AEDisposeDesc (&ae->apple_event); xfree (ae); |