s3: We can depend on pthreadpool now

Signed-off-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/configure.in b/source3/configure.in
index 4c2a3620d0c6a27aec69d8f21ec648153f261481..6e324a16a0278c9ee8fdf5e22d6d94285d33ffaa 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6180,7 +6180,6 @@ else
     AC_SUBST(PTHREADPOOL_OBJ, "lib/pthreadpool/pthreadpool_sync.o")
 fi
 
-AC_DEFINE(WITH_PTHREADPOOL, 1, [Whether to include pthreadpool helpers])
 PTHREADPOOLTEST="bin/pthreadpooltest"
 AC_SUBST(PTHREADPOOLTEST)
 

diff --git a/source3/lib/fncall.c b/source3/lib/fncall.c
index 79bf8260d9393ca315fe6363de4d81973bfac3ca..e40fd8343dd1943505ec1baa6e0dfc9c06236e8d 100644 (file)
--- a/source3/lib/fncall.c
+++ b/source3/lib/fncall.c
@@ -20,8 +20,6 @@
 #include "includes.h"
 #include "../lib/util/tevent_unix.h"
 
-#if WITH_PTHREADPOOL
-
 #include "lib/pthreadpool/pthreadpool.h"
 
 struct fncall_state {
@@ -323,43 +321,3 @@ int fncall_recv(struct tevent_req *req, int *perr)
        }
        return 0;
 }
-
-#else  /* WITH_PTHREADPOOL */
-
-struct fncall_context {
-       uint8_t dummy;
-};
-
-struct fncall_context *fncall_context_init(TALLOC_CTX *mem_ctx,
-                                          int max_threads)
-{
-       return talloc(mem_ctx, struct fncall_context);
-}
-
-struct fncall_state {
-       uint8_t dummy;
-};
-
-struct tevent_req *fncall_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-                              struct fncall_context *ctx,
-                              void (*fn)(void *private_data),
-                              void *private_data)
-{
-       struct tevent_req *req;
-       struct fncall_state *state;
-
-       req = tevent_req_create(mem_ctx, &state, struct fncall_state);
-       if (req == NULL) {
-               return NULL;
-       }
-       fn(private_data);
-       tevent_req_post(req, ev);
-       return req;
-}
-
-int fncall_recv(struct tevent_req *req, int *perr)
-{
-       return 0;
-}
-
-#endif