(Fmac_resume_apple_event): Distribute cast to pointer

over conditional branches.

diff --git a/src/ChangeLog b/src/ChangeLog
index e6f71cb..3faea82 100644 (file)
--- 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 df7e98c..ccacc65 100644 (file)
--- 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);