Alex Henrie : d3dcompiler_43/tests: Avoid using GCC's typeof extension.

Alexandre Julliard julliard at winehq.org
Thu Oct 4 17:14:43 CDT 2018


Module: wine
Branch: master
Commit: 451e4d326e595e246362505d7abeb4a84aca9c5f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=451e4d326e595e246362505d7abeb4a84aca9c5f

Author: Alex Henrie <alexhenrie24 at gmail.com>
Date:   Wed Sep 19 22:43:13 2018 -0600

d3dcompiler_43/tests: Avoid using GCC's typeof extension.

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 cc629fa..443ed27 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 5a85159..2c1c902 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[] = {




More information about the wine-cvs mailing list