Merge remote-tracking branch 'goog/stage-aosp-master' into HEADHEADmaster

1 files changed, 31 insertions, 0 deletions

diff --git a/engine/xpl/src/xpl_Memory.cc b/engine/xpl/src/xpl_Memory.cc
new file mode 100644
index 0000000..c452cb4
--- /dev/null
+++ b/engine/xpl/src/xpl_Memory.cc
@@ -0,0 +1,31 @@
+#include <malloc.h>
+#include <stdio.h>  
+#include <stdlib.h>
+#include <string.h>
+#include "xpl_Memory.h"
+
+
+#ifdef __cplusplus  
+extern "C" {
+#endif
+
+void * xplAllocMemEx(UINT32 bufsize, CPCHAR szFile, int nLine )
+{
+  char* ptr = (char*)malloc(bufsize);
+  if (ptr != 0) {
+    memset(ptr,0,bufsize);
+  }
+  return ptr;
+}
+
+void xplFreeMemEx(void *ptr, CPCHAR szFile, int nLine)
+{
+  if (ptr) {
+     free( ptr );
+  }
+}
+
+#ifdef __cplusplus  
+}
+#endif
+