diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2011-11-15 22:07:05 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-22 10:54:57 +0100 |
| commit | c22602160072638e0b84157757bb8ab2f982acb4 (patch) | |
| tree | ccda431761e534a4c8c5665953f1b8959e37bbdd /tests/auto/integrationtests | |
| parent | ece8f9cd51c3c6667806fffeb41bbc9a68eff81e (diff) | |
uclibc: Make the oomsimulator compile with uclibc
In the infinite wisdom uclibc defines __GLIBC__ but is not a
full drop-in replacement for the GLIBC. Check for !UCLIBC. Make sure
there is a disableHooks in case the GLIBC code is not compiled
Change-Id: I246d3ee7c1d3f48f7f6445daa01a4f001b9a3cb0
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'tests/auto/integrationtests')
| -rw-r--r-- | tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h b/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h index f2db6949cc..15500f590b 100644 --- a/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h +++ b/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h @@ -59,7 +59,7 @@ static void my_terminate_handler() exit(1); } -#ifdef __GLIBC__ +#if defined(__GLIBC__) && !defined(__UCLIBC__) /* Use glibc's memory allocation hooks */ // From glibc 2.14, the malloc hook variables are declared volatile. @@ -195,6 +195,12 @@ static struct QCrtDebugRegistrator } crtDebugRegistrator; +#else + +static void disableHooks() +{ +} + #endif struct AllocFailer |