fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 13:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util: fix MSVC build issue in disk_cache.h

Browse source 
Windows doesn't have dlfcn.h.  Protect the code in question
with #if ENABLE_SHADER_CACHE test.  And fix indentation.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Brian Paul 2017-02-21 15:52:40 -07:00
parent 40e0dbf96c
commit b87ef9e606
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/util/disk_cache.h
View file

@ -24,7 +24,9 @@
#ifndef DISK_CACHE_H #ifndef DISK_CACHE_H
#define DISK_CACHE_H #define DISK_CACHE_H
#ifdef ENABLE_SHADER_CACHE
#include <dlfcn.h> #include <dlfcn.h>
#endif
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -43,6 +45,7 @@ struct disk_cache;
static inline bool static inline bool
disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp) disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp)
{ {
#ifdef ENABLE_SHADER_CACHE
Dl_info info; Dl_info info;
struct stat st; struct stat st;
if (!dladdr(ptr, &info) || !info.dli_fname) { if (!dladdr(ptr, &info) || !info.dli_fname) {
@ -53,6 +56,9 @@ disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp)
} }
*timestamp = st.st_mtim.tv_sec; *timestamp = st.st_mtim.tv_sec;
return true; return true;
#else
return false;
#endif
} }
/* Provide inlined stub functions if the shader cache is disabled. */ /* Provide inlined stub functions if the shader cache is disabled. */