diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-02 17:43:10 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-02 17:43:10 (GMT) |
| commit | 5fc1013753babd397efbe5b7bae0dac387fbc2fd (patch) | |
| tree | 3a5ccd5b15397879ae4ec26a8708b5ee2d86dc15 /src/corelib/global/qglobal.h | |
| parent | 20cfe1e790295254370cf472df39813f864de7ea (diff) | |
| parent | e4bec39a139363d1ee4cf3fb15a3fe4499215e77 (diff) | |
| download | Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.zip Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.tar.gz Qt-5fc1013753babd397efbe5b7bae0dac387fbc2fd.tar.bz2 | |
Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 5ee1815..cbb8fda 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2065,6 +2065,9 @@ Q_DECLARE_TYPEINFO(long double, Q_PRIMITIVE_TYPE); Q_CORE_EXPORT void *qMalloc(size_t size); Q_CORE_EXPORT void qFree(void *ptr); Q_CORE_EXPORT void *qRealloc(void *ptr, size_t size); +Q_CORE_EXPORT void *qMallocAligned(size_t size, size_t alignment); +Q_CORE_EXPORT void *qReallocAligned(void *ptr, size_t size, size_t oldsize, size_t alignment); +Q_CORE_EXPORT void qFreeAligned(void *ptr); Q_CORE_EXPORT void *qMemCopy(void *dest, const void *src, size_t n); Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n); |