The branch, master has been updated
via 39684d2cbe1c8c69dc9ca5c6e05861e24091bb83 (commit)
via c9fe3256d87f4fcd119dc1a3c784f2196b4ad2fd (commit)
from 8cac8fd5d69f332db9e50865395d11e36639904f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 39684d2cbe1c8c69dc9ca5c6e05861e24091bb83
Author: Stefan Metzmacher <me...@samba.org>
Date: Thu Jul 16 09:06:42 2009 +0200
tevent: try to fix the build on QNX qnx18 6.4.1 it doesn't have SA_RESTART
defined
metze
commit c9fe3256d87f4fcd119dc1a3c784f2196b4ad2fd
Author: Stefan Metzmacher <me...@samba.org>
Date: Thu Jul 16 10:51:34 2009 +0200
s4:heimdal_build: tell heimdal we have inet_aton()
This should fix problems on Solaris.
metze
-----------------------------------------------------------------------
Summary of changes:
lib/tevent/testsuite.c | 12 +++++++++++-
source4/heimdal_build/roken.h | 4 ++++
2 files changed, 15 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index d964fb3..f9aca91 100644
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -66,7 +66,13 @@ static bool test_event_context(struct torture_context *test,
const char *backend = (const char *)test_data;
int alarm_count=0, info_count=0;
struct tevent_fd *fde;
- struct signal_event *se1, *se2, *se3;
+#ifdef SA_RESTART
+ struct tevent_signal *se1 = NULL;
+#endif
+ struct tevent_signal *se2 = NULL;
+#ifdef SA_SIGINFO
+ struct tevent_signal *se3 = NULL;
+#endif
int finished=0;
struct timeval t;
char c = 0;
@@ -92,7 +98,9 @@ static bool test_event_context(struct torture_context *test,
event_add_timed(ev_ctx, ev_ctx, timeval_current_ofs(2,0),
finished_handler, &finished);
+#ifdef SA_RESTART
se1 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESTART,
count_handler, &alarm_count);
+#endif
se2 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESETHAND,
count_handler, &alarm_count);
#ifdef SA_SIGINFO
se3 = event_add_signal(ev_ctx, ev_ctx, SIGUSR1, SA_SIGINFO,
count_handler, &info_count);
@@ -120,7 +128,9 @@ static bool test_event_context(struct torture_context *test,
torture_comment(test, "Got %.2f pipe events/sec\n",
fde_count/timeval_elapsed(&t));
+#ifdef SA_RESTART
talloc_free(se1);
+#endif
torture_assert_int_equal(test, alarm_count, 1+fde_count, "alarm count
mismatch");
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index decce03..87060cf 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -97,6 +97,10 @@
#define HAVE_INNETGR
#endif
+#ifndef HAVE_INET_ATON
+#define HAVE_INET_ATON
+#endif
+
/* we lie about having pidfile() so that NetBSD5 can compile. Nothing
in the parts of heimdal we use actually uses pidfile(), and we
don't use it in Samba, so this works, although its ugly */
--
Samba Shared Repository
