diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index 015b9f7..df89517 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -104,8 +104,6 @@
 static __inline__
 void ensure_valgrind ( char* caller )
 {
-   char* str;
-   int is_valgrind; 
    VG_(startup)();
 }
 
@@ -333,7 +331,9 @@
       case PTHREAD_MUTEX_TIMED_NP:
       case PTHREAD_MUTEX_ADAPTIVE_NP:
 #     endif
+#     ifdef GLIBC_2_1    
       case PTHREAD_MUTEX_FAST_NP:
+#     endif
       case PTHREAD_MUTEX_RECURSIVE_NP:
       case PTHREAD_MUTEX_ERRORCHECK_NP:
          attr->__mutexkind = type;