aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-10 01:27:44 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-10 01:27:44 +0000
commit6bc7f4aae7bc48c63fc03f879cac52df76313a67 (patch)
treebc4109b01e2369fee423612f2b6174ece4572bfe /tests
parentd27296f0e33a092dba538730b0a3b1955d2097c9 (diff)
Merged revisions 285931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r285931 | tilghman | 2010-09-09 20:25:50 -0500 (Thu, 09 Sep 2010) | 21 lines Merged revisions 285930 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r285930 | tilghman | 2010-09-09 20:16:32 -0500 (Thu, 09 Sep 2010) | 14 lines Merged revisions 285889 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r285889 | tilghman | 2010-09-09 19:13:45 -0500 (Thu, 09 Sep 2010) | 7 lines Fix Mac OS X build. This also fixes a rather grievous calculation error for the offset of ast_fdset, which was masked on Linux and FreeBSD, because these platforms check the first 256 FDs regardless of the bitmask setting (due to backwards compatibility). ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@285932 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'tests')
-rw-r--r--tests/test_poll.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/test_poll.c b/tests/test_poll.c
index 7fbf8cc51..815e0c6c4 100644
--- a/tests/test_poll.c
+++ b/tests/test_poll.c
@@ -45,7 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/test.h"
#include "asterisk/poll-compat.h"
-#ifndef HAVE_SBIN_LAUNCHD
static void *failsafe_cancel(void *vparent)
{
pthread_t parent = (pthread_t) (long) vparent;
@@ -232,21 +231,16 @@ AST_TEST_DEFINE(poll_test)
#endif
return res;
}
-#endif
static int unload_module(void)
{
-#ifndef HAVE_SBIN_LAUNCHD
AST_TEST_UNREGISTER(poll_test);
-#endif
return 0;
}
static int load_module(void)
{
-#ifndef HAVE_SBIN_LAUNCHD
AST_TEST_REGISTER(poll_test);
-#endif
return AST_MODULE_LOAD_SUCCESS;
}