From b87ef9e606a1644b03f15e821852c321c0043840 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 21 Feb 2017 15:52:40 -0700 Subject: [PATCH] util: fix MSVC build issue in disk_cache.h Windows doesn't have dlfcn.h. Protect the code in question with #if ENABLE_SHADER_CACHE test. And fix indentation. Reviewed-by: Timothy Arceri Reviewed-by: Roland Scheidegger --- src/util/disk_cache.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h index 8b6fc0ddcbf..7f4da809ccb 100644 --- a/src/util/disk_cache.h +++ b/src/util/disk_cache.h @@ -24,7 +24,9 @@ #ifndef DISK_CACHE_H #define DISK_CACHE_H +#ifdef ENABLE_SHADER_CACHE #include +#endif #include #include #include @@ -43,16 +45,20 @@ struct disk_cache; static inline bool disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp) { - Dl_info info; - struct stat st; - if (!dladdr(ptr, &info) || !info.dli_fname) { - return false; - } - if (stat(info.dli_fname, &st)) { - return false; - } - *timestamp = st.st_mtim.tv_sec; - return true; +#ifdef ENABLE_SHADER_CACHE + Dl_info info; + struct stat st; + if (!dladdr(ptr, &info) || !info.dli_fname) { + return false; + } + if (stat(info.dli_fname, &st)) { + return false; + } + *timestamp = st.st_mtim.tv_sec; + return true; +#else + return false; +#endif } /* Provide inlined stub functions if the shader cache is disabled. */ -- 2.30.2