cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-15 23:35:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with mm-replacement disabled.

Browse Source
This commit is contained in:
Nick Mathewson 2012-04-03 14:54:39 -04:00
parent 13dad99c2f
commit e78baf4a01
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/regress.c
View File

@ -2244,7 +2244,7 @@ end:
static void static void
test_mm_functions(void *arg) test_mm_functions(void *arg)
{ {
_tinytest_set_test_skipped(); tinytest_set_test_skipped_();
} }
#else #else
static int static int

6
test/regress_util.c
View File

@ -1081,10 +1081,12 @@ test_event_malloc(void *arg)
(void)arg; (void)arg;
/* mm_malloc(0) should simply return NULL. */ /* mm_malloc(0) should simply return NULL. */
#ifndef EVENT__DISABLE_MM_REPLACEMENT
errno = 0; errno = 0;
p = mm_malloc(0); p = mm_malloc(0);
tt_assert(p == NULL); tt_assert(p == NULL);
tt_int_op(errno, ==, 0); tt_int_op(errno, ==, 0);
#endif
/* Trivial case. */ /* Trivial case. */
errno = 0; errno = 0;
@ -1104,6 +1106,7 @@ test_event_calloc(void *arg)
void *p = NULL; void *p = NULL;
(void)arg; (void)arg;
#ifndef EVENT__DISABLE_MM_REPLACEMENT
/* mm_calloc() should simply return NULL /* mm_calloc() should simply return NULL
* if either argument is zero. */ * if either argument is zero. */
errno = 0; errno = 0;
@ -1118,6 +1121,7 @@ test_event_calloc(void *arg)
p = mm_calloc(1, 0); p = mm_calloc(1, 0);
tt_assert(p == NULL); tt_assert(p == NULL);
tt_int_op(errno, ==, 0); tt_int_op(errno, ==, 0);
#endif
/* Trivial case. */ /* Trivial case. */
errno = 0; errno = 0;
@ -1144,11 +1148,13 @@ test_event_strdup(void *arg)
void *p = NULL; void *p = NULL;
(void)arg; (void)arg;
#ifndef EVENT__DISABLE_MM_REPLACEMENT
/* mm_strdup(NULL) should set errno = EINVAL and return NULL. */ /* mm_strdup(NULL) should set errno = EINVAL and return NULL. */
errno = 0; errno = 0;
p = mm_strdup(NULL); p = mm_strdup(NULL);
tt_assert(p == NULL); tt_assert(p == NULL);
tt_int_op(errno, ==, EINVAL); tt_int_op(errno, ==, EINVAL);
#endif
/* Trivial cases. */ /* Trivial cases. */