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 9f845fe953e47676c6905421d7438ac33e905fbe..9a2358c9e497b4e4ef308b37043b111a66804f90 100644 (file)
--- a/libraries/libldap_r/threads.c
+++ b/libraries/libldap_r/threads.c
@@ -1,23 +1,29 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdarg.h>
 
+#include <ac/stdarg.h>
 #include <ac/stdlib.h>
 #include <ac/string.h>
+#include <ac/unistd.h>
 
-#include "ldap_pvt_thread.h"
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#include "ldap_thr_debug.h"  /* May redirect thread initialize/destroy calls */
 
 
 /*
@@ -32,6 +38,8 @@ 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;
@@ -44,6 +52,15 @@ int ldap_pvt_thread_initialize( void )
        if( rc ) return rc;
 #endif
 
+       /* kludge to pull symbol definitions in */
+       ldap_pvt_thread_rmutex_init( &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;
 }
 
@@ -52,9 +69,18 @@ int ldap_pvt_thread_destroy( void )
 #ifndef LDAP_THREAD_HAVE_TPOOL
        (void) ldap_int_thread_pool_shutdown();
 #endif
-       (void) ldap_int_thread_destroy();
+       return ldap_int_thread_destroy();
 }
 
+
+/*
+ * Default implementations of some LDAP thread routines
+ */
+
+#define LDAP_THREAD_IMPLEMENTATION
+#include "ldap_thr_debug.h"    /* May rename the symbols defined below */
+
+
 #ifndef LDAP_THREAD_HAVE_GETCONCURRENCY
 int
 ldap_pvt_thread_get_concurrency ( void )