Module: wine Branch: master Commit: 08b569d50599328df1531f20cceb5331bf718524 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08b569d50599328df1531f20c...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Aug 22 09:56:27 2019 +0200
d3dx9: Make qsort() callback functions cdecl.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx9_36/mesh.c | 6 +++--- dlls/d3dx9_36/preshader.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 355cdbd..5e0bb98 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1207,7 +1207,7 @@ struct vertex_metadata { DWORD first_shared_index; };
-static int compare_vertex_keys(const void *a, const void *b) +static int __cdecl compare_vertex_keys(const void *a, const void *b) { const struct vertex_metadata *left = a; const struct vertex_metadata *right = b; @@ -1585,7 +1585,7 @@ static void fill_attribute_table(DWORD *attrib_buffer, DWORD numfaces, void *ind attrib_table_size++; }
-static int attrib_entry_compare(const void *a, const void *b) +static int __cdecl attrib_entry_compare(const void *a, const void *b) { const DWORD *ptr_a = *(const DWORD **)a; const DWORD *ptr_b = *(const DWORD **)b; @@ -5840,7 +5840,7 @@ static D3DXVECTOR2 *triangulation_get_next_point(struct triangulation *t, struct return &outline->items[i].pos; }
-static int compare_vertex_indices(const void *a, const void *b) +static int __cdecl compare_vertex_indices(const void *a, const void *b) { const struct point2d_index *idx1 = a, *idx2 = b; const D3DXVECTOR2 *p1 = &idx1->outline->items[idx1->vertex].pos; diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 4680b4e..9852b9b 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -640,7 +640,7 @@ static void append_pres_const_sets_for_shader_input(struct d3dx_const_tab *const } }
-static int compare_const_set(const void *a, const void *b) +static int __cdecl compare_const_set(const void *a, const void *b) { const struct d3dx_const_param_eval_output *r1 = a; const struct d3dx_const_param_eval_output *r2 = b;