diff options
| author | dim <dim@FreeBSD.org> | 2013-12-22 20:46:31 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2013-12-22 20:46:31 +0000 |
| commit | 35d70075c976c725a15be76514cdb1561df49ef5 (patch) | |
| tree | 10e992ad7d291bdcd4b23ff07cc87a603c1e3a50 /usr.bin/sort | |
| parent | 701a873a65a7c7a7daed118e67cb75d5a1ff8383 (diff) | |
| download | FreeBSD-src-35d70075c976c725a15be76514cdb1561df49ef5.zip FreeBSD-src-35d70075c976c725a15be76514cdb1561df49ef5.tar.gz | |
In usr.bin/sort/radixsort.c, pop_ls_mt() is only referenced if
SORT_THREADS is defined, so make the whole function conditional, instead
of just the pthread calls in it.
MFC after: 3 days
Diffstat (limited to 'usr.bin/sort')
| -rw-r--r-- | usr.bin/sort/radixsort.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/sort/radixsort.c b/usr.bin/sort/radixsort.c index fde2b6f..f6cf6ac 100644 --- a/usr.bin/sort/radixsort.c +++ b/usr.bin/sort/radixsort.c @@ -171,6 +171,8 @@ pop_ls_st(void) return (sl); } +#if defined(SORT_THREADS) + /* * Pop sort level from the stack (multi-threaded style) */ @@ -180,9 +182,7 @@ pop_ls_mt(void) struct level_stack *saved_ls; struct sort_level *sl; -#if defined(SORT_THREADS) pthread_mutex_lock(&g_ls_mutex); -#endif if (g_ls) { sl = g_ls->sl; @@ -193,15 +193,15 @@ pop_ls_mt(void) saved_ls = NULL; } -#if defined(SORT_THREADS) pthread_mutex_unlock(&g_ls_mutex); -#endif sort_free(saved_ls); return (sl); } +#endif /* defined(SORT_THREADS) */ + static void add_to_sublevel(struct sort_level *sl, struct sort_list_item *item, size_t indx) { |
