($(BLD)/emacs.$(O), $(BLD)/w32select.$(O)): Depend on w32heap.h.

2 files changed, 16 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6ae26d7f5e9..ff49eff9284 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2005-06-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): Remove
+        macros.
+
+        * unexw32.c (RVA_TO_PTR): Moved here from w32heap.h.
+
+        * w32proc.c (RVA_TO_PTR): New macro.
+
+        * w32heap.c (RVA_TO_PTR): No need to #undef now.
+
+        * makefile.w32-in ($(BLD)/emacs.$(O), $(BLD)/w32select.$(O)):
+        Depend on w32heap.h.
+
 2005-06-06  Luc Teirlinck  <teirllm@auburn.edu>
 
         * keyboard.c (command_loop_1): Update Vthis_original_command.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index b5890593cd8..f25af87cb92 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -595,6 +595,7 @@ $(BLD)/emacs.$(O) : \
         $(SRC)/termhooks.h \
         $(SRC)/w32bdf.h \
         $(SRC)/w32gui.h \
+        $(SRC)/w32heap.h \
         $(SRC)/window.h
 
 $(BLD)/eval.$(O) : \
@@ -1430,6 +1431,7 @@ $(BLD)/w32select.$(O): \
         $(SRC)/systime.h \
         $(SRC)/w32bdf.h \
         $(SRC)/w32gui.h \
+        $(SRC)/w32heap.h \
         $(SRC)/w32term.h
 
 $(BLD)/w32reg.$(O): \