Enable 64-bit build on Linux & Mac

Licai Guo committed 12 years ago

Commit ac6828f1 parent f2aa3c78 files · +21 −13Browse files

Showing the changes to codec/encoder/core/src/memory_align.cpp (1 of 8 files). Show all

Unified · Split

codec/encoder/core/src/memory_align.cpp+1−1

@@ -111,7 +111,7 @@ void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const str_t* kpTag) { · 110 unmodified lines
111	return NULL;	111	return NULL;
112		112
113	pAlignedBuffer = pBuf + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt;	113	pAlignedBuffer = pBuf + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt;
114	pAlignedBuffer -= ((int32_t) pAlignedBuffer & kiAlignedBytes);	114	pAlignedBuffer -= ((uintptr_t) pAlignedBuffer & kiAlignedBytes);
115	* ((void**) (pAlignedBuffer - kiSizeOfVoidPointer)) = pBuf;	115	* ((void**) (pAlignedBuffer - kiSizeOfVoidPointer)) = pBuf;
116	* ((int32_t*) (pAlignedBuffer - (kiSizeOfVoidPointer + kiSizeOfInt))) = kiPayloadSize;	116	* ((int32_t*) (pAlignedBuffer - (kiSizeOfVoidPointer + kiSizeOfInt))) = kiPayloadSize;
117		117