svn commit: r259740 - head/usr.bin/sort

[Dimitry Andric]

Author: dim
Date: Sun Dec 22 20:46:31 2013
New Revision: 259740
URL: http://svnweb.freebsd.org/changeset/base/259740

Log:
  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

Modified:
  head/usr.bin/sort/radixsort.c

Modified: head/usr.bin/sort/radixsort.c
==============================================================================
--- head/usr.bin/sort/radixsort.c	Sun Dec 22 20:40:56 2013	(r259739)
+++ head/usr.bin/sort/radixsort.c	Sun Dec 22 20:46:31 2013	(r259740)
@@ -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)
 {