Restore pre-C99 preprocessor support (since rev 1.165)

[openldap] / libraries / libldap_r / thr_thr.c

diff --git a/libraries/libldap_r/thr_thr.c b/libraries/libldap_r/thr_thr.c
index eafccffb3f00f8576811c5eba19e7b6ca89a958d..2a9abae5454f160180ad822b0a03698df0dadb44 100644 (file)
--- a/libraries/libldap_r/thr_thr.c
+++ b/libraries/libldap_r/thr_thr.c
@@ -1,21 +1,26 @@
+/* thr_thr.c - wrappers around solaris threads */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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>.
  */
 
-/* thr_thr.c - wrappers around solaris threads */
-
 #include "portable.h"
 
 #if defined( HAVE_THR )
 
-#include "ldap_pvt_thread.h"
+#include "ldap_pvt_thread.h" /* Get the thread interface */
+#define LDAP_THREAD_IMPLEMENTATION
+#include "ldap_thr_debug.h"     /* May rename the symbols defined below */
 
 /*******************
  *                 *
@@ -57,9 +62,8 @@ ldap_pvt_thread_create( ldap_pvt_thread_t * thread,
        void *(*start_routine)( void *),
        void *arg)
 {
-       return( thr_create( NULL, 0, start_routine, arg,
-               detach ? THR_DETACHED : 0,
-               thread ) );
+       return( thr_create( NULL, LDAP_PVT_THREAD_STACK_SIZE, start_routine,
+               arg, detach ? THR_DETACHED : 0, thread ) );
 }
 
 void 
@@ -149,4 +153,34 @@ ldap_pvt_thread_mutex_trylock( ldap_pvt_thread_mutex_t *mp )
        return( mutex_trylock( mp ) );
 }
 
+ldap_pvt_thread_t
+ldap_pvt_thread_self( void )
+{
+       return thr_self();
+}
+
+int
+ldap_pvt_thread_key_create( ldap_pvt_thread_key_t *key )
+{
+       return thr_keycreate( key, NULL );
+}
+
+int
+ldap_pvt_thread_key_destroy( ldap_pvt_thread_key_t key )
+{
+       return( 0 );
+}
+
+int
+ldap_pvt_thread_key_setdata( ldap_pvt_thread_key_t key, void *data )
+{
+       return thr_setspecific( key, data );
+}
+
+int
+ldap_pvt_thread_key_getdata( ldap_pvt_thread_key_t key, void **data )
+{
+       return thr_getspecific( key, data );
+}
+
 #endif /* HAVE_THR */