[PATCH v2] d3dcompiler_43/tests: Avoid using GCC's typeof extension

Alex Henrie alexhenrie24 at gmail.com
Wed Sep 19 23:43:13 CDT 2018


Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 dlls/d3dcompiler_43/tests/blob.c       | 6 +++---
 dlls/d3dcompiler_43/tests/reflection.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c
index cc629fad84..443ed2754c 100644
--- a/dlls/d3dcompiler_43/tests/blob.c
+++ b/dlls/d3dcompiler_43/tests/blob.c
@@ -33,9 +33,9 @@
  */
 #define D3DERR_INVALIDCALL 0x8876086c
 
-static typeof(D3DCreateBlob) *pD3DCreateBlob;
-static typeof(D3DGetBlobPart) *pD3DGetBlobPart;
-static typeof(D3DStripShader) *pD3DStripShader;
+static HRESULT (WINAPI *pD3DCreateBlob)(SIZE_T, ID3DBlob **);
+static HRESULT (WINAPI *pD3DGetBlobPart)(const void *, SIZE_T, D3D_BLOB_PART, UINT, ID3DBlob **);
+static HRESULT (WINAPI *pD3DStripShader)(const void *, SIZE_T, UINT, ID3DBlob **);
 
 #define MAKE_TAG(ch0, ch1, ch2, ch3) \
     ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \
diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c
index 5a85159d89..2c1c9028bb 100644
--- a/dlls/d3dcompiler_43/tests/reflection.c
+++ b/dlls/d3dcompiler_43/tests/reflection.c
@@ -38,7 +38,7 @@
  */
 #define D3DERR_INVALIDCALL 0x8876086c
 
-static typeof(D3DReflect) *pD3DReflect;
+static HRESULT (WINAPI *pD3DReflect)(const void *, SIZE_T, REFIID, void **);
 
 /* Creator string for comparison - Version 9.29.952.3111 (43) */
 static DWORD shader_creator[] = {
-- 
2.19.0




More information about the wine-devel mailing list