diff options
Diffstat (limited to 'lib/tevent')
| -rw-r--r-- | lib/tevent/build_macros.m4 | 1 | ||||
| -rw-r--r-- | lib/tevent/pytevent.c | 1 | ||||
| -rw-r--r-- | lib/tevent/python.mk | 9 | ||||
| -rw-r--r-- | lib/tevent/testsuite.c | 12 | ||||
| -rw-r--r-- | lib/tevent/tevent.mk | 2 | ||||
| -rw-r--r-- | lib/tevent/tevent_signal.c | 2 |
6 files changed, 11 insertions, 16 deletions
diff --git a/lib/tevent/build_macros.m4 b/lib/tevent/build_macros.m4 index c036668cd1..bb7fad8f7a 100644 --- a/lib/tevent/build_macros.m4 +++ b/lib/tevent/build_macros.m4 @@ -7,6 +7,7 @@ AC_DEFUN(BUILD_WITH_SHARED_BUILD_DIR, if test x"$with_shared_build_dir" != x; then sharedbuilddir=$with_shared_build_dir CFLAGS="$CFLAGS -I$with_shared_build_dir/include" + CPPFLAGS="$CPPFLAGS -I$with_shared_build_dir/include" LDFLAGS="$LDFLAGS -L$with_shared_build_dir/lib" fi AC_SUBST(sharedbuilddir) diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c index 5d10554531..5c34064004 100644 --- a/lib/tevent/pytevent.c +++ b/lib/tevent/pytevent.c @@ -16,6 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "replace.h" #include <Python.h> #ifndef Py_RETURN_NONE diff --git a/lib/tevent/python.mk b/lib/tevent/python.mk index abc60fa2ce..0c1beca675 100644 --- a/lib/tevent/python.mk +++ b/lib/tevent/python.mk @@ -1,10 +1,5 @@ -# TODO: Change python stuff to tevent -[PYTHON::swig_events] +[PYTHON::pytevent] LIBRARY_REALNAME = tevent.$(SHLIBEXT) PRIVATE_DEPENDENCIES = LIBTEVENT PYTALLOC LIBSAMBA-UTIL LIBREPLACE -swig_events_OBJ_FILES = $(libteventsrcdir)/pytevent.o - -$(swig_events_OBJ_FILES): CFLAGS+=$(CFLAG_NO_CAST_QUAL) - -PC_FILES += $(libteventsrcdir)/tevent.pc +pytevent_OBJ_FILES = $(libteventsrcdir)/pytevent.o diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c index 1b811f5fa2..faa18577a7 100644 --- a/lib/tevent/testsuite.c +++ b/lib/tevent/testsuite.c @@ -27,9 +27,9 @@ static int fde_count; static void fde_handler(struct tevent_context *ev_ctx, struct tevent_fd *f, - uint16_t flags, void *private) + uint16_t flags, void *private_data) { - int *fd = (int *)private; + int *fd = (int *)private_data; char c; #ifdef SA_SIGINFO kill(getpid(), SIGUSR1); @@ -41,16 +41,16 @@ static void fde_handler(struct tevent_context *ev_ctx, struct tevent_fd *f, } static void finished_handler(struct tevent_context *ev_ctx, struct tevent_timer *te, - struct timeval tval, void *private) + struct timeval tval, void *private_data) { - int *finished = (int *)private; + int *finished = (int *)private_data; (*finished) = 1; } static void count_handler(struct tevent_context *ev_ctx, struct signal_event *te, - int signum, int count, void *info, void *private) + int signum, int count, void *info, void *private_data) { - int *countp = (int *)private; + int *countp = (int *)private_data; (*countp) += count; } diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk index be7e298218..ac5710ff05 100644 --- a/lib/tevent/tevent.mk +++ b/lib/tevent/tevent.mk @@ -22,8 +22,6 @@ installdirs:: installheaders:: installdirs cp $(srcdir)/tevent.h $(DESTDIR)$(includedir) - cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir) - cp $(srcdir)/tevent_util.h $(DESTDIR)$(includedir) installlibs:: installdirs cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c index c21ba209af..04ee6975bd 100644 --- a/lib/tevent/tevent_signal.c +++ b/lib/tevent/tevent_signal.c @@ -29,7 +29,7 @@ #define NUM_SIGNALS 64 /* maximum number of SA_SIGINFO signals to hold in the queue */ -#define SA_INFO_QUEUE_COUNT 10 +#define SA_INFO_QUEUE_COUNT 100 struct sigcounter { uint32_t count; |