You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by mf...@apache.org on 2008/02/12 10:50:27 UTC
svn commit: r620734 - in /harmony/enhanced/drlvm/trunk: make/vm/em.xml
vm/port/include/port_atomic.h
Author: mfursov
Date: Tue Feb 12 01:50:18 2008
New Revision: 620734
URL: http://svn.apache.org/viewvc?rev=620734&view=rev
Log:
Fixing Windows64 build problems introduced by HARMONY-5396 commit
Modified:
harmony/enhanced/drlvm/trunk/make/vm/em.xml
harmony/enhanced/drlvm/trunk/vm/port/include/port_atomic.h
Modified: harmony/enhanced/drlvm/trunk/make/vm/em.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/em.xml?rev=620734&r1=620733&r2=620734&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/em.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/em.xml Tue Feb 12 01:50:18 2008
@@ -44,7 +44,7 @@
<linker id="linker" extends="common.linker">
<libset libs="harmonyvm,hythr" dir="${drlvm.shlib.dir}" />
- <libset libs="apr-1" dir="${drlvm.lib.dir}" />
+ <libset libs="port,apr-1" dir="${drlvm.lib.dir}" />
<syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread" if="is.linux"/>
<syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/>
Modified: harmony/enhanced/drlvm/trunk/vm/port/include/port_atomic.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/include/port_atomic.h?rev=620734&r1=620733&r2=620734&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/include/port_atomic.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/include/port_atomic.h Tue Feb 12 01:50:18 2008
@@ -145,7 +145,7 @@
#pragma intrinsic(_InterlockedCompareExchange16)
#pragma intrinsic(_InterlockedCompareExchange64)
-APR_DECLARE(uint8) port_atomic_cas8(volatile uint8 * data,
+INLINE uint8 port_atomic_cas8(volatile uint8 * data,
uint8 value, uint8 comp);
INLINE uint16 port_atomic_cas16(volatile uint16 * data,