You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/10/28 11:15:37 UTC
svn commit: r589322 - in /harmony/enhanced/drlvm/trunk/vm: jitrino/src/jet/
jitrino/src/shared/ port/include/ port/src/vmem/linux/
Author: hindessm
Date: Sun Oct 28 03:15:36 2007
New Revision: 589322
URL: http://svn.apache.org/viewvc?rev=589322&view=rev
Log:
Use correct header for malloc definition on unix.
Modified:
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_ia32.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_obj.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_stk.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Arena.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp
harmony/enhanced/drlvm/trunk/vm/port/include/port_malloc.h
harmony/enhanced/drlvm/trunk/vm/port/src/vmem/linux/port_vmem.c
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.cpp?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg.cpp Sun Oct 28 03:15:36 2007
@@ -24,7 +24,11 @@
#include "trace.h"
#include "stats.h"
+#ifdef WIN32
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include <stdarg.h>
#include <algorithm>
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_ia32.cpp?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_ia32.cpp Sun Oct 28 03:15:36 2007
@@ -21,7 +21,9 @@
#include "compiler.h"
#include "trace.h"
+#ifdef WIN32
#include <malloc.h>
+#endif
#include <memory.h>
#include <assert.h>
#include <stdlib.h>
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_obj.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_obj.cpp?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_obj.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_obj.cpp Sun Oct 28 03:15:36 2007
@@ -21,7 +21,9 @@
#include "compiler.h"
#include "trace.h"
+#ifdef WIN32
#include <malloc.h>
+#endif
#include <memory.h>
#include <assert.h>
#include <stdlib.h>
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_stk.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_stk.cpp?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_stk.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_stk.cpp Sun Oct 28 03:15:36 2007
@@ -21,7 +21,9 @@
#include "compiler.h"
#include "trace.h"
+#ifdef WIN32
#include <malloc.h>
+#endif
#include <memory.h>
#include <assert.h>
#include <stdlib.h>
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp Sun Oct 28 03:15:36 2007
@@ -23,7 +23,11 @@
*/
#include <assert.h>
#include <algorithm>
+#ifdef WIN32
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include "open/vm.h"
#include "open/hythread_ext.h"
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Arena.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Arena.cpp?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Arena.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/Arena.cpp Sun Oct 28 03:15:36 2007
@@ -21,8 +21,11 @@
*
*/
+#ifdef WIN32
#include <malloc.h>
+#else
#include <stdlib.h>
+#endif
#include <assert.h>
#include "Arena.h"
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/MemoryManager.cpp Sun Oct 28 03:15:36 2007
@@ -21,7 +21,11 @@
*
*/
+#ifdef WIN32
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include <iostream>
#include <stdio.h>
#include <assert.h>
Modified: harmony/enhanced/drlvm/trunk/vm/port/include/port_malloc.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/include/port_malloc.h?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/include/port_malloc.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/include/port_malloc.h Sun Oct 28 03:15:36 2007
@@ -21,7 +21,11 @@
#ifndef _PORT_MALLOC_H_
#define _PORT_MALLOC_H_
+#ifdef WIN32
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
// FIXME
// Very basic memory allocation utilities
Modified: harmony/enhanced/drlvm/trunk/vm/port/src/vmem/linux/port_vmem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/vmem/linux/port_vmem.c?rev=589322&r1=589321&r2=589322&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/vmem/linux/port_vmem.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/vmem/linux/port_vmem.c Sun Oct 28 03:15:36 2007
@@ -23,7 +23,7 @@
#include <sys/mman.h>
#include <unistd.h>
#include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <limits.h>
#include "port_vmem.h"