diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 16:55:11 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 16:55:11 +0000 |
| commit | fc44f8a893521c0f8eb43af8f5783e69ebfe19b1 (patch) | |
| tree | 56dd448c11f77c53a545e0027a8c7ed8814351ec /test | |
| parent | 1760f5378838f561bf8f382293714c9760efb183 (diff) | |
| download | libapr-fc44f8a893521c0f8eb43af8f5783e69ebfe19b1.tar.gz | |
merge trunk revs 1083169, 1083177, 1083178, 1083183, and 1083227
to resolve some gcc warnings and dead code on Windows
(the testlfsabi change from r1083183 is omitted, as the testcases
aren't in this branch)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1083869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test')
| -rw-r--r-- | test/testrand.c | 2 | ||||
| -rw-r--r-- | test/testshm.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/test/testrand.c b/test/testrand.c index 6ced4a34f..333491f3e 100644 --- a/test/testrand.c +++ b/test/testrand.c @@ -63,6 +63,7 @@ static void rand_run_kat(abts_case *tc, rnd_fn *f, apr_random_t *r, } } +#if APR_HAS_FORK static int rand_check_kat(rnd_fn *f, apr_random_t *r, const unsigned char expected[128]) { @@ -76,6 +77,7 @@ static int rand_check_kat(rnd_fn *f, apr_random_t *r, return 1; return 0; } +#endif static void rand_add_zeroes(apr_random_t *r) { diff --git a/test/testshm.c b/test/testshm.c index 6c192f290..bbaf62504 100644 --- a/test/testshm.c +++ b/test/testshm.c @@ -31,6 +31,7 @@ #if APR_HAS_SHARED_MEMORY +#if APR_HAS_FORK static int msgwait(int sleep_sec, int first_box, int last_box) { int i; @@ -58,6 +59,7 @@ static void msgput(int boxnum, char *msg) apr_cpystrn(boxes[boxnum].msg, msg, strlen(msg) + 1); boxes[boxnum].msgavail = 1; } +#endif /* APR_HAS_FORK */ static void test_anon_create(abts_case *tc, void *data) { |