[PATCH] include: Avoid depending on config.h for the __builtin_clz check.
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Sun Jun 16 17:38:27 CDT 2019
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
include/wine/wined3d.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index ada5636550..8ffe189fa9 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -26,10 +26,6 @@
#ifndef __WINE_WINED3D_H
#define __WINE_WINED3D_H
-#ifndef __WINE_WINE_PORT_H
-# error You must include wine/port.h to use this header
-#endif
-
#include "wine/list.h"
#define WINED3D_OK S_OK
@@ -2752,7 +2748,7 @@ HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_
/* Return the integer base-2 logarithm of x. Undefined for x == 0. */
static inline unsigned int wined3d_log2i(unsigned int x)
{
-#ifdef HAVE___BUILTIN_CLZ
+#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
return __builtin_clz(x) ^ 0x1f;
#else
static const unsigned int l[] =
--
2.17.1
More information about the wine-devel
mailing list