diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-06-24 22:01:38 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-24 22:04:52 +0400 |
commit | df1c400420b39506e38745bb0db3d4f9797de424 (patch) | |
tree | 11ffd31924f8b69f6149c55e89a76819b1eceb52 /source/blender/blenkernel | |
parent | 04648767fabda7d9461e32c89afcd806d0227547 (diff) |
Use gnu-libc arg order for BLI_sort_r
When building on gnu-libc don't use our own implementation.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/navmesh_conversion.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/navmesh_conversion.c b/source/blender/blenkernel/intern/navmesh_conversion.c index 64d59b165e1..8ab9cdd41e7 100644 --- a/source/blender/blenkernel/intern/navmesh_conversion.c +++ b/source/blender/blenkernel/intern/navmesh_conversion.c @@ -305,7 +305,7 @@ struct SortContext { const int *trisToFacesMap; }; -static int compareByData(void *ctx, const void *a, const void *b) +static int compareByData(const void *a, const void *b, void *ctx) { return (((struct SortContext *)ctx)->recastData[((struct SortContext *)ctx)->trisToFacesMap[*(int *)a]] - ((struct SortContext *)ctx)->recastData[((struct SortContext *)ctx)->trisToFacesMap[*(int *)b]]); diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 665bf2a85a9..1cc89d5f3fa 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1011,7 +1011,7 @@ static void *distribute_threads_exec_cb(void *data) return 0; } -static int distribute_compare_orig_index(void *user_data, const void *p1, const void *p2) +static int distribute_compare_orig_index(const void *p1, const void *p2, void *user_data) { int *orig_index = (int *) user_data; int index1 = orig_index[*(const int *)p1]; |