(mac_window_to_frame): Remove duplicate define.

diff --git a/src/ChangeLog b/src/ChangeLog
index 160e667fbf86dbca593b3aa31d1a09ae5d40ade5..c34dca4e6d38ce361639a0b92fb280366dafae50 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macselect.c (get_scrap_target_type_list): Avoid NULL pointer
+       dereference.
+
+       * macterm.c (mac_window_to_frame): Remove duplicate define.
+
 2005-07-14  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (code_convert_region_unwind): ARG is changed to a cons.

diff --git a/src/macterm.c b/src/macterm.c
index 533464390c59dd8eee3fe56703b274bdccb414fc..22471f46e8cea95cd417838632050f94a4edcf79 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -94,8 +94,6 @@ Boston, MA 02110-1301, USA.  */
                        (NILP (Vmac_command_key_is_meta) ? optionKey : cmdKey) \
                        : controlKey)
 #define macAltKey      (NILP (Vmac_command_key_is_meta) ? cmdKey : optionKey)
-
-#define mac_window_to_frame(wp) (((mac_output *) GetWRefCon (wp))->mFP)
 \f
 
 /* Non-nil means Emacs uses toolkit scroll bars.  */