Browse Source

more windows kerfuffle

Colin Davidson 2 years ago
parent
commit
171d5b4012
2 changed files with 3 additions and 2 deletions
  1. 2 1
      core/os/os_windows.odin
  2. 1 1
      core/sys/windows/kernel32.odin

+ 2 - 1
core/os/os_windows.odin

@@ -4,6 +4,7 @@ package os
 import win32 "core:sys/windows"
 import "core:runtime"
 import "core:intrinsics"
+import "core:c"
 
 Handle    :: distinct uintptr
 File_Time :: distinct u64
@@ -139,7 +140,7 @@ _processor_core_count :: proc() -> int {
 		result = win32.GetLogicalProcessorInformation(&processors[0], &length)
 		if result {
 			for processor in processors {
-				if processor.Relationship == windows.RelationProcessorCore {
+				if processor.Relationship == win32.RelationProcessorCore {
 					thread := intrinsics.count_ones(processor.ProcessorMask)
 					thread_count += thread
 				}

+ 1 - 1
core/sys/windows/kernel32.odin

@@ -1043,7 +1043,7 @@ DUMMYUNIONNAME_u :: struct #raw_union {
 }
 
 SYSTEM_LOGICAL_PROCESSOR_INFORMATION :: struct {
-	ProcessorMask: ULONGPTR,
+	ProcessorMask: ULONG_PTR,
 	Relationship: LOGICAL_PROCESSOR_RELATIONSHIP,
 	DummyUnion: DUMMYUNIONNAME_u,
 }