Restore pre-C99 preprocessor support (since rev 1.165)

[openldap] / libraries / libldap_r / threads.c

diff --git a/libraries/libldap_r/threads.c b/libraries/libldap_r/threads.c
index c810ad56be709f17ef1260080f1384ad47fd8138..9a2358c9e497b4e4ef308b37043b111a66804f90 100644 (file)
--- a/libraries/libldap_r/threads.c
+++ b/libraries/libldap_r/threads.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,7 @@ int ldap_pvt_thread_initialize( void )
        int rc;
        static int init = 0;
        ldap_pvt_thread_rmutex_t rm;
+       ldap_pvt_thread_t tid;
 
        /* we only get one shot at this */
        if( init++ ) return -1;
@@ -53,10 +54,11 @@ int ldap_pvt_thread_initialize( void )
 
        /* kludge to pull symbol definitions in */
        ldap_pvt_thread_rmutex_init( &rm );
-       ldap_pvt_thread_rmutex_lock( &rm );
-       ldap_pvt_thread_rmutex_trylock( &rm );
-       ldap_pvt_thread_rmutex_unlock( &rm );
-       ldap_pvt_thread_rmutex_unlock( &rm );
+       tid = ldap_pvt_thread_self();
+       ldap_pvt_thread_rmutex_lock( &rm, tid );
+       ldap_pvt_thread_rmutex_trylock( &rm, tid );
+       ldap_pvt_thread_rmutex_unlock( &rm, tid );
+       ldap_pvt_thread_rmutex_unlock( &rm, tid );
        ldap_pvt_thread_rmutex_destroy( &rm );
 
        return 0;