From b684583f0ce861ce89e85bfb72e52794c6ebbe80 Mon Sep 17 00:00:00 2001 From: vxiiduu <73044267+vxiiduu@users.noreply.github.com> Date: Sun, 13 Aug 2023 00:23:36 +1000 Subject: [PATCH] Update llama-util.h Avoid duplicate function signature as requested --- llama-util.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/llama-util.h b/llama-util.h index 0c967e100..d65f88044 100644 --- a/llama-util.h +++ b/llama-util.h @@ -275,16 +275,15 @@ struct llama_mmap { if (prefetch) { // The PrefetchVirtualMemory API is only present on Windows 8 and above, so we // will dynamically load it using GetProcAddress. - BOOL (WINAPI *pPrefetchVirtualMemory) (HANDLE, ULONG_PTR, PWIN32_MEMORY_RANGE_ENTRY, ULONG); + typedef BOOL (WINAPI *PPREFETCHVIRTUALMEMORY) (HANDLE, ULONG_PTR, PWIN32_MEMORY_RANGE_ENTRY, ULONG); + PPREFETCHVIRTUALMEMORY pPrefetchVirtualMemory; HMODULE hKernel32; // This call is guaranteed to succeed. hKernel32 = GetModuleHandleW(L"kernel32.dll"); // This call may fail if on a pre-Win8 system. - pPrefetchVirtualMemory = - (BOOL (WINAPI *) (HANDLE, ULONG_PTR, PWIN32_MEMORY_RANGE_ENTRY, ULONG)) - GetProcAddress(hKernel32, "PrefetchVirtualMemory"); + pPrefetchVirtualMemory = (PPREFETCHVIRTUALMEMORY) GetProcAddress(hKernel32, "PrefetchVirtualMemory"); if (pPrefetchVirtualMemory) { // Advise the kernel to preload the mapped memory.