This propagates changes in
b08daaedd45457b775cb90d2c2650510daff1c8d to
this branch.
Change-Id: I3b72f53c7b24d27075ea8593c347b504bfd8f581
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: hjk <qthjk@ovi.com>
#include <QtCore/qarraydata.h>
+#include <stdlib.h>
+
QT_BEGIN_NAMESPACE
const QArrayData QArrayData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, 0 };
if (!(options & RawData))
allocSize += (alignment - Q_ALIGNOF(QArrayData));
- QArrayData *header = static_cast<QArrayData *>(qMalloc(allocSize));
+ QArrayData *header = static_cast<QArrayData *>(::malloc(allocSize));
Q_CHECK_PTR(header);
if (header) {
quintptr data = (quintptr(header) + sizeof(QArrayData) + alignment - 1)
if (data == &qt_array_unsharable_empty)
return;
- qFree(data);
+ ::free(data);
}
QT_END_NAMESPACE