harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r413114 - in /incubator/harmony/enhanced/drlvm/trunk/vm: em/src/ gc/src/ include/ include/open/ port/include/ port/include/tl/ port/src/disasm/linux/ port/src/disasm/win/ port/src/file_io/linux/ port/src/file_io/win/ port/src/misc/linux/ po...
Date Fri, 09 Jun 2006 18:09:18 GMT
Author: geirm
Date: Fri Jun  9 11:09:16 2006
New Revision: 413114

URL: http://svn.apache.org/viewvc?rev=413114&view=rev
Log:
tweaks to stop the <apr-1/foo.h> stuff, and 
just do <foo.h> for APR includes.  Not a big deal
but let me get more comfortable w/ the build.

No functional changes.  

Tests pass on winxp.  Linux not tested yet


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h
    incubator/harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/allocation.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/block_store.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_header.h
    incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_resize.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_v4.h
    incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/hash_table.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/include/em_intf.h
    incubator/harmony/enhanced/drlvm/trunk/vm/include/open/compmgr.h
    incubator/harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_disasm.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_dso.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_filepath.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_general.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_sysinfo.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_vmem.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/set_mt.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/vector_mt.h
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/linux/disasm.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/win/disasm.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/canonical.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/filepath.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/filepath.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/dso.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/sysinfo.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/timezone.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/user.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/dso.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/timezone.c
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/time/misc_platform_natives.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/classloader.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_em_intf.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/natives_support.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_main.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dump.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/hythr/hythreads.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.h

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/em/src/DrlEMImpl.h Fri Jun  9 11:09:16 2006
@@ -27,7 +27,7 @@
 #include "open/vm_util.h"
 #include "open/em_profile_access.h"
 
-#include "apr-1/apr_dso.h"
+#include <apr_dso.h>
 #include <string>
 #include <set>
 #include <vector>

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/em/src/em_intf.cpp Fri Jun  9 11:09:16 2006
@@ -24,8 +24,8 @@
 #include "open/types.h"
 #include "open/em_vm.h"
 #include "open/compmgr.h"
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_strings.h>
+#include <apr_pools.h>
+#include <apr_strings.h>
 
 #include "DrlEMImpl.h"
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/allocation.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/allocation.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/allocation.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/allocation.cpp Fri Jun  9 11:09:16 2006
@@ -25,7 +25,7 @@
 
 // VM interface header files
 #include "platform_lowlevel.h"
-#include <apr-1/apr_atomic.h>
+#include <apr_atomic.h>
 #include "open/vm_gc.h"
 #include "open/gc.h"
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/block_store.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/block_store.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/block_store.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/block_store.cpp Fri Jun  9 11:09:16 2006
@@ -24,8 +24,8 @@
 #include <iostream>
 
 // VM interface header files
-#include <apr-1/apr_atomic.h>
-#include <apr-1/apr_file_io.h>
+#include <apr_atomic.h>
+#include <apr_file_io.h>
 #include "port_malloc.h"
 #include "port_sysinfo.h"
 #include "open/vm_gc.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_header.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_header.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_header.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_header.h Fri Jun  9 11:09:16 2006
@@ -23,7 +23,7 @@
 
 #include <assert.h>
 #include "platform_lowlevel.h"
-#include <apr-1/apr_atomic.h>
+#include <apr_atomic.h>
 
 #include "open/types.h"
 #include "open/vm_gc.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_resize.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_resize.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_resize.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_resize.cpp Fri Jun  9 11:09:16 2006
@@ -24,8 +24,8 @@
 #include <iostream>
 
 // VM interface header files
-#include <apr-1/apr_atomic.h>
-#include <apr-1/apr_file_io.h>
+#include <apr_atomic.h>
+#include <apr_file_io.h>
 #include "port_malloc.h"
 #include "port_sysinfo.h"
 #include "open/vm_gc.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_v4.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_v4.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_v4.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/gc_v4.h Fri Jun  9 11:09:16 2006
@@ -20,7 +20,7 @@
 #ifndef _gc_v4_H_
 #define _gc_v4_H_
 
-#include <apr-1/apr_time.h>
+#include <apr_time.h>
 
 #include "gc_header.h"
 #include "open/vm.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/hash_table.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/hash_table.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/hash_table.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/gc/src/hash_table.cpp Fri Jun  9 11:09:16 2006
@@ -27,7 +27,7 @@
 //#include "open/types.h"
 #include "hash_table.h"
 #include "port_malloc.h"
-#include <apr-1/apr_atomic.h>
+#include <apr_atomic.h>
 
 // GC includes
 #include "gc_cout.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/include/em_intf.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/include/em_intf.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/include/em_intf.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/include/em_intf.h Fri Jun  9 11:09:16 2006
@@ -22,7 +22,7 @@
 
 #include "open/types.h"
 #include "open/em.h"
-#include <apr-1/apr_dso.h>
+#include <apr_dso.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/include/open/compmgr.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/include/open/compmgr.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/include/open/compmgr.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/include/open/compmgr.h Fri Jun  9 11:09:16 2006
@@ -28,7 +28,7 @@
 #ifndef _OPEN_COMPMGR_H
 #define _OPEN_COMPMGR_H
 
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
 
 #ifdef __cplusplus
 extern "C"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/include/open/vm_util.h Fri Jun  9 11:09:16 2006
@@ -22,7 +22,7 @@
 #ifndef _VM_UTILS_H_
 #define _VM_UTILS_H_
 
-#include <apr-1/apr_general.h>
+#include <apr_general.h>
 #include "port_malloc.h"
 #include "open/types.h"
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_disasm.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_disasm.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_disasm.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_disasm.h Fri Jun  9 11:09:16
2006
@@ -21,9 +21,9 @@
 #ifndef _DISASM_H_
 #define _DISASM_H_
 
-#include "apr-1/apr_general.h"
-#include "apr-1/apr_pools.h"
-#include "apr-1/apr_file_io.h"
+#include <apr_general.h>
+#include <apr_pools.h>
+#include <apr_file_io.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_dso.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_dso.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_dso.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_dso.h Fri Jun  9 11:09:16
2006
@@ -23,8 +23,8 @@
 
 #include "open/types.h"
 #include "port_general.h"
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_dso.h>
+#include <apr_pools.h>
+#include <apr_dso.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_filepath.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_filepath.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_filepath.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_filepath.h Fri Jun  9 11:09:16
2006
@@ -22,7 +22,7 @@
 #define _PORT_FILEPATH_H_
 
 #include "port_general.h"
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_general.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_general.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_general.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_general.h Fri Jun  9 11:09:16
2006
@@ -21,7 +21,7 @@
 #ifndef _PORT_GENERAL_H_
 #define _PORT_GENERAL_H_
 
-#include <apr-1/apr.h>
+#include <apr.h>
 
 #ifndef NULL
 #ifdef __cplusplus

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_sysinfo.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_sysinfo.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_sysinfo.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_sysinfo.h Fri Jun  9 11:09:16
2006
@@ -23,7 +23,7 @@
 
 #include "open/types.h"
 #include "port_general.h"
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_vmem.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_vmem.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_vmem.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/port_vmem.h Fri Jun  9 11:09:16
2006
@@ -22,7 +22,7 @@
 #define _PORT_VMEM_H_
 
 #include "port_general.h"
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/memory_pool.h Fri Jun  9 11:09:16
2006
@@ -23,7 +23,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
 #include "open/types.h"
 #include "log_macro.h"
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/set_mt.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/set_mt.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/set_mt.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/set_mt.h Fri Jun  9 11:09:16
2006
@@ -29,7 +29,7 @@
 
 #include "log_macro.h"
 #include "tl/allocator.h"
-#include <apr-1/apr_thread_mutex.h>
+#include <apr_thread_mutex.h>
 #include "tl/memory_pool.h"
 
 namespace tl

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/vector_mt.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/vector_mt.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/vector_mt.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/include/tl/vector_mt.h Fri Jun  9 11:09:16
2006
@@ -27,7 +27,7 @@
 
 #include "tl/vector.h"
 #include "log_macro.h"
-#include <apr-1/apr_thread_mutex.h>
+#include <apr_thread_mutex.h>
 #include "tl/memory_pool.h"
 
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/linux/disasm.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/linux/disasm.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/linux/disasm.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/linux/disasm.c Fri Jun  9 11:09:16
2006
@@ -26,9 +26,9 @@
 #include <stdlib.h>
 
 #include "port_disasm.h"
-#include "apr-1/apr_dso.h"
-#include "apr-1/apr_strings.h"
-#include "apr-1/apr_portable.h"
+#include <apr_dso.h>
+#include <apr_strings.h>
+#include <apr_portable.h>
 
 // this is mostly imperical data 
 #if defined(_IA32_)

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/win/disasm.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/win/disasm.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/win/disasm.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/disasm/win/disasm.c Fri Jun  9 11:09:16
2006
@@ -23,10 +23,11 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <apr_dso.h>
+#include <apr_strings.h>
+#include <apr_portable.h>
+
 #include "port_disasm.h"
-#include "apr-1/apr_dso.h"
-#include "apr-1/apr_strings.h"
-#include "apr-1/apr_portable.h"
 
 // this is mostly imperical data 
 #if defined(_IA32_)

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/canonical.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/canonical.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/canonical.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/canonical.c Fri Jun 
9 11:09:16 2006
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include "port_filepath.h"
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
 
 
 APR_DECLARE(char *) port_filepath_canonical(const char* original,

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/filepath.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/filepath.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/filepath.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/linux/filepath.c Fri Jun  9
11:09:16 2006
@@ -19,7 +19,7 @@
 */  
 
 #include "port_filepath.h"
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
 
 APR_DECLARE(char *) port_filepath_merge(const char* root,
                           const char* trail,

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/canonical.c Fri Jun  9
11:09:16 2006
@@ -20,8 +20,10 @@
 
 #include <direct.h>
 #include <windows.h>
+
+#include <apr_strings.h>
+
 #include "port_filepath.h"
-#include <apr-1/apr_strings.h>
 
 APR_DECLARE(char *) port_filepath_canonical(const char* original,
 												 apr_pool_t* pool)

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/filepath.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/filepath.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/filepath.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/file_io/win/filepath.c Fri Jun  9 11:09:16
2006
@@ -19,7 +19,7 @@
 */  
 
 #include "port_filepath.h"
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
 
 APR_DECLARE(char *) port_filepath_merge(const char* root,
                           const char* trail,

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/dso.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/dso.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/dso.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/dso.c Fri Jun  9 11:09:16
2006
@@ -19,9 +19,9 @@
 */  
 
 #include <dlfcn.h>
-#include <stdlib.h>
-#include <apr-1/apr_dso.h>
-#include <apr-1/apr_strings.h>
+#include <stdliapr_dso.h>
+#include <b.h>
+#include <apr_strings.h>
 #include "port_dso.h"
 
 struct apr_dso_handle_t {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/sysinfo.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/sysinfo.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/sysinfo.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/sysinfo.c Fri Jun  9 11:09:16
2006
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <errno.h>
 #include "port_sysinfo.h"
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
 
 APR_DECLARE(apr_status_t) port_executable_name(char** self_name,
 								   apr_pool_t* pool) {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/timezone.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/timezone.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/timezone.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/timezone.c Fri Jun  9 11:09:16
2006
@@ -19,9 +19,9 @@
 */  
 
 #include <unistd.h>
-#include <apr-1/apr_file_info.h>
-#include <apr-1/apr_strings.h>
-#include <apr-1/apr_file_io.h>
+#include <apr_file_info.h>
+#include <apr_strings.h>
+#include <apr_file_io.h>
 #include "port_sysinfo.h"
 
 static const char* const zone_dir = "/usr/share/zoneinfo";

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/user.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/user.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/user.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/linux/user.c Fri Jun  9 11:09:16
2006
@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include "port_sysinfo.h"
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
 
 APR_DECLARE(apr_status_t) port_user_name(char** account,
 							 apr_pool_t* pool){

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/dso.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/dso.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/dso.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/dso.c Fri Jun  9 11:09:16
2006
@@ -20,11 +20,13 @@
 
 #include <windows.h>
 #include <string.h>
-#include <apr-1/apr_dso.h>
+
+#include <apr_dso.h>
+#include <apr_strings.h>
+#include <apr_env.h>
+
 #include "port_dso.h"
 #include "port_sysinfo.h"
-#include <apr-1/apr_strings.h>
-#include <apr-1/apr_env.h>
 
 struct apr_dso_handle_t {
 	apr_pool_t *pool;

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/timezone.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/timezone.c?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/timezone.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/misc/win/timezone.c Fri Jun  9 11:09:16
2006
@@ -19,7 +19,7 @@
 */
 
 #include <windows.h>
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
 #include "port_sysinfo.h"
 
 typedef struct {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/time/misc_platform_natives.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/time/misc_platform_natives.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/time/misc_platform_natives.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/time/misc_platform_natives.cpp Fri
Jun  9 11:09:16 2006
@@ -19,7 +19,7 @@
  */  
 
 
-#include <apr-1/apr_time.h>
+#include <apr_time.h>
 #include "platform_core_natives.h"
 
 //////////////////////////// T I M E begin ////////////////////////////////////////////////////////////

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/classloader.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/classloader.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/classloader.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/classloader.h Fri Jun  9 11:09:16
2006
@@ -21,7 +21,7 @@
 #define _CLASSLOADER_H_
 
 #include <sstream>
-#include <apr-1/apr_pools.h>
+#include <apr_pools.h>
 
 #include "vm_core_types.h"
 #include "object_layout.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_em_intf.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_em_intf.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_em_intf.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_em_intf.h Fri Jun  9 11:09:16
2006
@@ -21,7 +21,7 @@
 #define _DLL_EM_INTF_H_
 
 #include "em_intf_cpp.h"
-#include <apr-1/apr_dso.h>
+#include <apr_dso.h>
 
 bool vm_is_a_em_dll(const char *dll_filename);
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/dll_jit_intf.h Fri Jun  9 11:09:16
2006
@@ -25,8 +25,8 @@
 #include <string.h>
 #include "jit_intf_cpp.h"
 #include "jit_export_jpda.h"
-#include <apr-1/apr_dso.h>
-#include <apr-1/apr_dso.h>
+#include <apr_dso.h>
+#include <apr_dso.h>
 #include "open/thread.h"
 
 bool vm_is_a_jit_dll(const char *dll_filename);

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jvmti_internal.h Fri Jun  9 11:09:16
2006
@@ -23,8 +23,8 @@
 #include "jvmti_utils.h"
 #include "vm_threads.h"
 #include "jit_export_jpda.h"
-#include <apr-1/apr_dso.h>
-#include <apr-1/apr_strings.h>
+#include <apr_dso.h>
+#include <apr_strings.h>
 #include "log_macro.h"
 
 //using namespace du_ti;

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/natives_support.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/natives_support.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/natives_support.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/natives_support.h Fri Jun  9
11:09:16 2006
@@ -26,7 +26,7 @@
 #ifndef _NATIVES_SUPPORT_LIB_H_
 #define _NATIVES_SUPPORT_LIB_H_
 
-#include <apr-1/apr_dso.h>
+#include <apr_dso.h>
 #include "vm_core_types.h"
 #include "jni_types.h"
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp Fri
Jun  9 11:09:16 2006
@@ -29,8 +29,9 @@
 using namespace std;
 
 #include <assert.h>
+#include <apr_atomic.h>
+
 #include "String_Pool.h"
-#include <apr-1/apr_atomic.h>
 #include "environment.h"
 #include "open/vm_util.h"
 #include "atomics.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp Fri
Jun  9 11:09:16 2006
@@ -44,8 +44,8 @@
 #include "verifier.h"
 
 #include "port_filepath.h"
-#include <apr-1/apr_file_io.h>
-#include <apr-1/apr_file_info.h>
+#include <apr_file_io.h>
+#include <apr_file_info.h>
 
 #include "jarfile_util.h"
 #include "jni_utils.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/dll_gc.cpp Fri Jun  9 11:09:16
2006
@@ -25,7 +25,7 @@
 
 #ifndef USE_GC_STATIC
 
-#include <apr-1/apr_dso.h>
+#include <apr_dso.h>
 #include "dll_gc.h"
 #include "open/gc.h"
 #include "open/vm_util.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/gc/stop_the_world_root_set_enum.cpp
Fri Jun  9 11:09:16 2006
@@ -22,7 +22,7 @@
 #include "cxxlog.h"
 
 #include "root_set_enum_internal.h"
-#include <apr-1/apr_time.h>
+#include <apr_time.h>
 #include "unloading.h"
 #include "thread_manager.h"
 #include "interpreter.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/parse_arguments.cpp Fri Jun
 9 11:09:16 2006
@@ -22,8 +22,8 @@
 #define LOG_DOMAIN "vm.core"
 #include "cxxlog.h"
 
-#include <apr-1/apr_strings.h>
-#include <apr-1/apr_env.h>
+#include <apr_strings.h>
+#include <apr_env.h>
 #include "port_filepath.h"
 
 #include <string.h>

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/properties.cpp Fri Jun  9 11:09:16
2006
@@ -24,10 +24,10 @@
 
 #include "properties.h"
 #include "open/vm_util.h"
-#include <apr-1/apr_file_io.h>
-#include <apr-1/apr_file_info.h>
-#include <apr-1/apr_env.h>
-#include <apr-1/apr_strings.h>
+#include <apr_file_io.h>
+#include <apr_file_info.h>
+#include <apr_env.h>
+#include <apr_strings.h>
 #include "port_dso.h"
 #include "port_filepath.h"
 #include "port_sysinfo.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_main.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_main.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_main.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_main.cpp Fri Jun  9 11:09:16
2006
@@ -24,7 +24,7 @@
 #include "thread_generic.h"
 #include "open/vm_util.h"
 #include "properties.h"
-#include <apr-1/apr_env.h>
+#include <apr_env.h>
 #include "vm_synch.h"
 #include "init.h"
 #include "compile.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dump.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dump.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dump.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/dump.cpp Fri Jun  9 11:09:16
2006
@@ -21,8 +21,8 @@
 #include <assert.h>
 
 #include "dump.h"
-#include "apr-1/apr_file_io.h"
-#include "apr-1/apr_pools.h"
+#include <apr_file_io.h>
+#include <apr_pools.h>
 #include "port_disasm.h"
 
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti.cpp Fri Jun  9 11:09:16
2006
@@ -36,7 +36,7 @@
 #include "open/thread.h"
 #include "port_filepath.h"
 #include "port_dso.h"
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
 
 #ifdef PLATFORM_NT
 #define AGENT_ONLOAD "_Agent_OnLoad@12"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_property.cpp Fri Jun
 9 11:09:16 2006
@@ -21,6 +21,8 @@
  * JVMTI property API
  */
 
+#include <apr_file_info.h>
+
 #include "jvmti_direct.h"
 #include "jvmti_utils.h"
 #include "environment.h"
@@ -28,7 +30,6 @@
 #include "cxxlog.h"
 #include "port_filepath.h"
 #include "suspend_checker.h"
-#include <apr-1/apr_file_info.h>
 
 /*
  * Add To Bootstrap Class Loader Search

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_rawmon.cpp Fri Jun  9
11:09:16 2006
@@ -21,11 +21,12 @@
  * JVMTI raw monitor API
  */
 
+#include <apr_time.h>
+
 #include "platform_lowlevel.h"
 #include "lock_manager.h"
 #include "jvmti_direct.h"
 #include "jvmti_utils.h"
-#include <apr-1/apr_time.h>
 #include "vm_threads.h"
 #include "vm_process.h"
 #include "cxxlog.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/java_lang_VMExecutionEngine.cpp
Fri Jun  9 11:09:16 2006
@@ -26,7 +26,7 @@
  * java.lang.VMExecutionEngine class.
  */
 
-#include <apr-1/apr_file_io.h>
+#include <apr_file_io.h>
 #include "environment.h"
 #include "port_filepath.h"
 #include "port_sysinfo.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/atomics.cpp Fri Jun  9 11:09:16
2006
@@ -18,13 +18,14 @@
  * @version $Revision: 1.1.2.1.4.4 $
  */  
 
+#include <apr_atomic.h>
+
 #include "jni.h"
 #include "Class.h"
 #include "object_handles.h"
 #include "environment.h"
 #include "atomics.h"
 #include "vm_arrays.h"
-#include <apr-1/apr_atomic.h>
 #include "port_atomic.h"
 #include "open/thread.h"
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/hythr/hythreads.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/hythr/hythreads.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/hythr/hythreads.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/hythr/hythreads.h Fri Jun
 9 11:09:16 2006
@@ -18,11 +18,11 @@
  * @version $Revision: 1.1.2.1.4.4 $
  */  
 #include "vm_threads.h"
-#include <apr-1/apr_general.h>
-#include <apr-1/apr_thread_mutex.h>
-#include <apr-1/apr_thread_cond.h>
-#include <apr-1/apr_thread_proc.h>
-#include <apr-1/apr_portable.h>
+#include <apr_general.h>
+#include <apr_thread_mutex.h>
+#include <apr_thread_cond.h>
+#include <apr_thread_proc.h>
+#include <apr_portable.h>
 
 #include<stdio.h>
 #include<assert.h>

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp Fri Jun
 9 11:09:16 2006
@@ -22,7 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <vector>
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
+
 #include "assert.h"
 #include "port_malloc.h"
 #include "port_dso.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_strings.cpp Fri Jun  9 11:09:16
2006
@@ -19,12 +19,14 @@
  */  
 
 #define LOG_DOMAIN "vm.accessors"
+
+#include <apr_atomic.h>
+
 #include "cxxlog.h"
 
 #include "vm_strings.h"
 #include "environment.h"
 #include "vm_stats.h"
-#include <apr-1/apr_atomic.h>
 #include "exceptions.h"
 #include "vm_arrays.h"
 

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.cpp?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.cpp
Fri Jun  9 11:09:16 2006
@@ -18,9 +18,9 @@
  * @version $Revision: 1.1.2.2.4.5 $
  */  
 
-#include <apr-1/apr_atomic.h>
-#include <apr-1/apr_lib.h>
-#include <apr-1/apr_strings.h>
+#include <apr_atomic.h>
+#include <apr_lib.h>
+#include <apr_strings.h>
 
 #include "open/compmgr.h"
 #include "component_manager_impl.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.h?rev=413114&r1=413113&r2=413114&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.h
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmstart/src/compmgr/component_manager_impl.h
Fri Jun  9 11:09:16 2006
@@ -22,8 +22,8 @@
 #define _VM_COMPONENT_MANAGER_IMPL_H
 
 #include "component_manager.h"
-#include <apr-1/apr_thread_rwlock.h>
-#include <apr-1/apr_dso.h>
+#include <apr_thread_rwlock.h>
+#include <apr_dso.h>
 
 typedef struct _Dll {
     /**



Mime
View raw message