fix commit 16156 for 32-bit Windows/MSVC

git-svn-id: http://caml.inria.fr/svn/ocaml/version/4.02@16159 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

Author: Damien Doligez

asmrun/signals_asm.c

@@ -19,7 +19,6 @@
 #include <signal.h>
 #include <errno.h>
 #include <stdio.h>
-#include "caml/address_class.h"
 #include "caml/fail.h"
 #include "caml/memory.h"
 #include "caml/osdeps.h"
@@ -45,6 +44,18 @@ extern signal_handler caml_win32_signal(int sig, signal_handler action);
 extern void caml_win32_overflow_detection();
 #endif
 
+extern char * caml_code_area_start, * caml_code_area_end;
+extern char caml_system__code_begin, caml_system__code_end;
+
+/* Do not use the macro from address_class.h here. */
+#undef Is_in_code_area
+#define Is_in_code_area(pc) \
+ ( ((char *)(pc) >= caml_code_area_start && \
+    (char *)(pc) <= caml_code_area_end)     \
+|| ((char *)(pc) >= &caml_system__code_begin && \
+    (char *)(pc) <= &caml_system__code_end)     \
+|| (Classify_addr(pc) & In_code_area) )
+
 /* This routine is the common entry point for garbage collection
    and signal handling.  It can trigger a callback to OCaml code.
    With system threads, this callback can cause a context switch.

byterun/caml/address_class.h

@@ -33,29 +33,17 @@
 #define Is_in_value_area(a)                                     \
   (Classify_addr(a) & (In_heap | In_young | In_static_data))
 
-#ifdef NATIVE_CODE
 #define Is_in_code_area(pc) \
  (    ((char *)(pc) >= caml_code_area_start && \
        (char *)(pc) <= caml_code_area_end)     \
-   || ((char *)(pc) >= &caml_system__code_begin && \
-       (char *)(pc) <= &caml_system__code_end)     \
    || (Classify_addr(pc) & In_code_area) )
-#else
-#define Is_in_code_area(pc) \
- (    ((char *)(pc) >= caml_code_area_start && \
-       (char *)(pc) <= caml_code_area_end)     \
-   || (Classify_addr(pc) & In_code_area) )
-#endif /* NATIVE_CODE */
 
 
 /***********************************************************************/
 /* The rest of this file is private and may change without notice. */
 
 extern char *caml_young_start, *caml_young_end;
 extern char * caml_code_area_start, * caml_code_area_end;
-#ifdef NATIVE_CODE
-extern char caml_system__code_begin, caml_system__code_end;
-#endif
 
 #define Not_in_heap 0
 #define In_heap 1