2009-11-09 Ivan Maidanski <ivmai@mail.ru>

	* os_dep.c (SIZE_T, PULONG_PTR): Remove.
	* os_dep.c (ULONG_PTR): Replace with GC_ULONG_PTR (defined as GC
	"word"); add the comment.
	* os_dep.c (GetWriteWatch_type, detect_GetWriteWatch,
	GC_gww_read_dirty): Prefix ULONG_PTR with "GC_".

diff --git a/ChangeLog b/ChangeLog
index 419c7effdf00047294dfd55742b09f9eefcbb3fb..41accb5415676dfc056dcbf4ce3a2087d2f9473f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-09  Ivan Maidanski <ivmai@mail.ru>
+
+       * os_dep.c (SIZE_T, PULONG_PTR): Remove.
+       * os_dep.c (ULONG_PTR): Replace with GC_ULONG_PTR (defined as GC
+       "word"); add the comment.
+       * os_dep.c (GetWriteWatch_type, detect_GetWriteWatch,
+       GC_gww_read_dirty): Prefix ULONG_PTR with "GC_".
+
 2009-11-07  Ivan Maidanski <ivmai@mail.ru>
 
        * win32_threads.c (THREAD_TABLE_SZ): Change back to a power-of-two

diff --git a/os_dep.c b/os_dep.c
index 13dda9e5172fbe0c51b09d5450b124f11c68e46f..a525283ca982ee224773f4ed3c2b402458b70498 100644 (file)
--- a/os_dep.c
+++ b/os_dep.c
@@ -1424,18 +1424,13 @@ void GC_register_data_segments(void)
 #     define WRITE_WATCH_FLAG_RESET 1
 #   endif
 
-#   if !defined(_BASETSD_H_) && !defined(_BASETSD_H)
-#     ifdef _WIN64
-        typedef unsigned __int64 ULONG_PTR;
-#     else
-        typedef unsigned long ULONG_PTR;
-#     endif
-      typedef ULONG_PTR SIZE_T;
-      typedef ULONG_PTR * PULONG_PTR;
-#   endif
+    /* Since we can't easily check whether ULONG_PTR and SIZE_T are     */
+    /* defined in Win32 basetsd.h, we define own ULONG_PTR.             */
+#   define GC_ULONG_PTR word
 
     typedef UINT (WINAPI * GetWriteWatch_type)(
-      DWORD, PVOID, SIZE_T, PVOID*, PULONG_PTR, PULONG);
+                                DWORD, PVOID, GC_ULONG_PTR /* SIZE_T */,
+                                PVOID *, GC_ULONG_PTR *, PULONG);
     static GetWriteWatch_type GetWriteWatch_func;
     static DWORD GetWriteWatch_alloc_flag;
 
@@ -1480,7 +1475,7 @@ void GC_register_data_segments(void)
                                     PAGE_READWRITE);
         if (page != NULL) {
           PVOID pages[16];
-          ULONG_PTR count = 16;
+          GC_ULONG_PTR count = 16;
           DWORD page_size;
           /* Check that it actually works.  In spite of some            */
           /* documentation it actually seems to exist on W2K.           */
@@ -2500,7 +2495,7 @@ STATIC void GC_or_pages(page_hash_table pht1, page_hash_table pht2)
     BZERO(GC_grungy_pages, sizeof(GC_grungy_pages));
 
     for (i = 0; i != GC_n_heap_sects; ++i) {
-      ULONG_PTR count;
+      GC_ULONG_PTR count;
 
       do {
         PVOID * pages, * pages_end;