drd.h: removed inline functions and replaced these by direct client request invocations.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11318 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/tests/rwlock_type_checking.stderr.exp b/drd/tests/rwlock_type_checking.stderr.exp
index c1ee6db..b3d2dc9 100644
--- a/drd/tests/rwlock_type_checking.stderr.exp
+++ b/drd/tests/rwlock_type_checking.stderr.exp
@@ -3,12 +3,10 @@
    at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?)
    by 0x........: main (rwlock_type_checking.c:?)
 rwlock 0x........ was first observed at:
-   at 0x........: vgDrdCl_annotate_rwlock_create (drd.h:?)
-   by 0x........: main (rwlock_type_checking.c:?)
+   at 0x........: main (rwlock_type_checking.c:?)
 
 Attempt to use a POSIX rwlock as a user-defined rwlock: rwlock 0x.........
-   at 0x........: vgDrdCl_annotate_rwlock_released (drd.h:?)
-   by 0x........: main (rwlock_type_checking.c:?)
+   at 0x........: main (rwlock_type_checking.c:?)
 rwlock 0x........ was first observed at:
    at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?)
    by 0x........: main (rwlock_type_checking.c:?)