1
0
Эх сурвалжийг харах

Ticket 48103 - update DS for new nunc-stans header file

Description:  Remove references to ns_thrpool.h, and replace it with nunc-stans.h

              Also the function params for ns_add_job needed to be updated.

https://fedorahosted.org/389/ticket/48103

Reviewed by: rmeggins(Thanks!)
Mark Reynolds 10 жил өмнө
parent
commit
34635fbff3

+ 2 - 2
configure

@@ -21325,7 +21325,7 @@ $as_echo "using $withval" >&6; }
         nunc_stans_lib="-L$withval/lib"
     nunc_stans_libdir="$withval/lib"
     nunc_stans_incdir="$withval/include"
-    if ! test -e "$nunc_stans_incdir/nunc-stans/ns_thrpool.h" ; then
+    if ! test -e "$nunc_stans_incdir/nunc-stans/nunc-stans.h" ; then
       as_fn_error $? "$withval include dir not found" "$LINENO" 5
     fi
     nunc_stans_inc="-I$nunc_stans_incdir"
@@ -21347,7 +21347,7 @@ $as_echo_n "checking for --with-nunc-stans-inc... " >&6; }
 # Check whether --with-nunc-stans-inc was given.
 if test "${with_nunc_stans_inc+set}" = set; then :
   withval=$with_nunc_stans_inc;
-  if test -e "$withval"/nunc-stans/ns_thrpool.h
+  if test -e "$withval"/nunc-stans/nunc-stans.h
   then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: using $withval" >&5
 $as_echo "using $withval" >&6; }

+ 1 - 1
ldap/servers/slapd/daemon.c

@@ -3278,7 +3278,7 @@ ns_handle_new_connection(struct ns_job_t *job)
 	 */
 	c->c_tp = ns_job_get_tp(job);
 	connection_acquire_nolock(c); /* event framework now has ref */
-	ns_add_job(ns_job_get_tp(job), NULL, NS_JOB_NONE, ns_handle_pr_read_ready, c);
+	ns_add_job(ns_job_get_tp(job), NS_JOB_NONE, ns_handle_pr_read_ready, c, NULL);
 	return;
 }
 #endif

+ 1 - 1
ldap/servers/slapd/slap.h

@@ -173,7 +173,7 @@ typedef struct symbol_t {
 #include "uuid.h"
 
 #ifdef ENABLE_NUNC_STANS
-#include <nunc-stans/ns_thrpool.h>
+#include <nunc-stans/nunc-stans.h>
 #endif
 
 #if defined(OS_solaris)

+ 2 - 2
m4/nunc-stans.m4

@@ -34,7 +34,7 @@ AC_ARG_WITH(nunc-stans, AS_HELP_STRING([--with-nunc-stans@<:@=PATH@:>@],[nunc-st
     nunc_stans_lib="-L$withval/lib"
     nunc_stans_libdir="$withval/lib"
     nunc_stans_incdir="$withval/include"
-    if ! test -e "$nunc_stans_incdir/nunc-stans/ns_thrpool.h" ; then
+    if ! test -e "$nunc_stans_incdir/nunc-stans/nunc-stans.h" ; then
       AC_MSG_ERROR([$withval include dir not found])
     fi
     nunc_stans_inc="-I$nunc_stans_incdir"
@@ -49,7 +49,7 @@ AC_MSG_RESULT(no))
 AC_MSG_CHECKING(for --with-nunc-stans-inc)
 AC_ARG_WITH(nunc-stans-inc, AS_HELP_STRING([--with-nunc-stans-inc=PATH],[nunc-stans include file directory]),
 [
-  if test -e "$withval"/nunc-stans/ns_thrpool.h
+  if test -e "$withval"/nunc-stans/nunc-stans.h
   then
     AC_MSG_RESULT([using $withval])
     nunc_stans_incdir="$withval"