Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / thread_mpi / pthreads.c

diff --git a/src/gromacs/gmxlib/thread_mpi/pthreads.c b/src/gromacs/gmxlib/thread_mpi/pthreads.c
index 4e3735150daa9a0347090f63950a4a51821abdf5..ebdf5c418223c45945e9196e169c0da13e943df6 100644 (file)
--- a/src/gromacs/gmxlib/thread_mpi/pthreads.c
+++ b/src/gromacs/gmxlib/thread_mpi/pthreads.c
@@ -208,8 +208,6 @@ int tMPI_Thread_create_aff(tMPI_Thread_t *thread,
     {
 #ifdef TMPI_SET_AFFINITY
         /* now set the affinity of the new thread */
-        int ret;
-
         pthread_mutex_lock( &(aff_init) );
         ret=tMPI_Set_affinity(aff_thread_number++);
         pthread_mutex_unlock( &(aff_init) );