[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.1/kdelibs/kjs
From:       Harri Porten <porten () kde ! org>
Date:       2008-07-22 21:07:35
Message-ID: 1216760855.197669.24060.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 836732 by porten:

Merged revision 836729:
Patches by Cygwin ports maintainer. See bug #130219.

 M  +4 -4      collector.cpp  


--- branches/KDE/4.1/kdelibs/kjs/collector.cpp #836731:836732
@@ -42,7 +42,7 @@
 #include <mach/thread_act.h>
 #include <mach/vm_map.h>
 
-#elif PLATFORM(WIN_OS)
+#elif PLATFORM(WIN_OS) || COMPILER(CYGWIN)
 
 #include <windows.h>
 
@@ -173,7 +173,7 @@
 #if PLATFORM(DARWIN)
     vm_address_t address = 0;
     vm_map(current_task(), &address, BLOCK_SIZE, BLOCK_OFFSET_MASK, \
VM_FLAGS_ANYWHERE, MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_DEFAULT, \
                VM_INHERIT_DEFAULT);
-#elif PLATFORM(WIN_OS)
+#elif PLATFORM(WIN_OS) || COMPILER(CYGWIN)
      // windows virtual address granularity is naturally 64k
     LPVOID address = VirtualAlloc(NULL, BLOCK_SIZE, MEM_COMMIT | MEM_RESERVE, \
PAGE_READWRITE);  #elif HAVE(POSIX_MEMALIGN)
@@ -215,7 +215,7 @@
 
 #if PLATFORM(DARWIN)
     vm_deallocate(current_task(), reinterpret_cast<vm_address_t>(block), \
                BLOCK_SIZE);
-#elif PLATFORM(WIN_OS)
+#elif PLATFORM(WIN_OS) || COMPILER(CYGWIN)
     VirtualFree(block, BLOCK_SIZE, MEM_RELEASE);
 #elif HAVE(POSIX_MEMALIGN)
     free(block);
@@ -486,7 +486,7 @@
         MOV pTib, EAX
     }
     void *stackBase = (void *)pTib->StackBase;
-#elif PLATFORM(WIN_OS) && PLATFORM(X86) && COMPILER(GCC)
+#elif (PLATFORM(WIN_OS) || COMPILER(CYGWIN)) && PLATFORM(X86) && COMPILER(GCC)
     NT_TIB *pTib;
 		__asm__("movl  %%fs:0x18,%0"
 						: "=r" (pTib)


[prev in list] [next in list] [prev in thread] [next in thread]