aboutsummaryrefslogtreecommitdiffstats
path: root/libparc/parc/algol/parc_Memory.c
diff options
context:
space:
mode:
authorAngelo Mantellini <manangel@cisco.com>2019-02-05 08:50:26 +0100
committerAngelo Mantellini <manangel@cisco.com>2019-02-06 16:23:04 +0100
commit9f68541e0f55495d61dd9e583bec38740a247597 (patch)
tree55519e34159ac1eb691e080e4c1eab5b0e4847bd /libparc/parc/algol/parc_Memory.c
parentb77148ddc3def71e6c412c3afb5f1c20be2d77cd (diff)
[HICN-26] Windows compatibilty for libparc
Change-Id: I6ebff82a81a2bf42fa3bf210ff0e6e530ce21915 Signed-off-by: Angelo Mantellini <manangel@cisco.com>
Diffstat (limited to 'libparc/parc/algol/parc_Memory.c')
-rw-r--r--[-rwxr-xr-x]libparc/parc/algol/parc_Memory.c23
1 files changed, 16 insertions, 7 deletions
diff --git a/libparc/parc/algol/parc_Memory.c b/libparc/parc/algol/parc_Memory.c
index eebdadf0..6552a902 100755..100644
--- a/libparc/parc/algol/parc_Memory.c
+++ b/libparc/parc/algol/parc_Memory.c
@@ -13,21 +13,19 @@
* limitations under the License.
*/
-/**
- */
-#include <config.h>
-
-#include <parc/assert/parc_Assert.h>
-
+#ifndef _WIN32
#include <unistd.h>
+#endif
+
+#include <config.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <stdio.h>
-
#include <stdint.h>
#include <stdbool.h>
+#include <parc/assert/parc_Assert.h>
#include <parc/algol/parc_Memory.h>
#include <parc/algol/parc_SafeMemory.h>
#include <parc/algol/parc_StdlibMemory.h>
@@ -93,6 +91,14 @@ parcMemory_DeallocateImpl(void **pointer)
((PARCMemoryDeallocate *) parcMemory->Deallocate)(pointer);
}
+#ifdef _WIN32
+void
+parcMemory_DeallocateAlignImpl(void **pointer)
+{
+ ((PARCMemoryDeallocateAlign *) parcMemory->DeallocateAlign)(pointer);
+}
+#endif
+
void *
parcMemory_Reallocate(void *pointer, size_t newSize)
{
@@ -138,6 +144,9 @@ PARCMemoryInterface PARCMemoryAsPARCMemory = {
.AllocateAndClear = (uintptr_t) parcMemory_AllocateAndClear,
.MemAlign = (uintptr_t) parcMemory_MemAlign,
.Deallocate = (uintptr_t) parcMemory_DeallocateImpl,
+#ifdef _WIN32
+ .DeallocateAlign = (uintptr_t)parcMemory_DeallocateAlignImpl,
+#endif
.Reallocate = (uintptr_t) parcMemory_Reallocate,
.StringDuplicate = (uintptr_t) parcMemory_StringDuplicate,
.Outstanding = (uintptr_t) parcMemory_Outstanding