Author: mturk
Date: Mon Apr 20 08:57:55 2009
New Revision: 766626
URL: http://svn.apache.org/viewvc?rev=766626&view=rev
Log:
Move platform includes to arch include
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/darwin/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c
commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c
commons/sandbox/runtime/trunk/src/main/native/os/unix/file.c
commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/syslog.c
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr.h?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr.h Mon Apr 20
08:57:55 2009
@@ -73,14 +73,6 @@
#include <winsock2.h>
#include <mswsock.h>
#include <ws2tcpip.h>
-#include <psapi.h>
-#include <tlhelp32.h>
-#include <aclapi.h>
-#include <lm.h>
-#include <sddl.h>
-#include <iphlpapi.h>
-#include <userenv.h>
-#include <shellapi.h>
#endif /* HAVE_WINDOWS_H */
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/darwin/acr_arch_private.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/darwin/acr_arch_private.h?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/native/include/arch/darwin/acr_arch_private.h
(original)
+++
commons/sandbox/runtime/trunk/src/main/native/include/arch/darwin/acr_arch_private.h
Mon Apr 20 08:57:55 2009
@@ -17,7 +17,13 @@
#ifndef _ACR_ARCH_PRIVATE_H
#define _ACR_ARCH_PRIVATE_H
-#include "acr_arch_private.h"
+/* Platform specific includes
+ */
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/utsname.h>
+#include <mach/machine.h>
+#include <mach-o/arch.h>
#ifdef __cplusplus
extern "C" {
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h
(original)
+++
commons/sandbox/runtime/trunk/src/main/native/include/arch/hpux/acr_arch_private.h
Mon Apr 20 08:57:55 2009
@@ -17,7 +17,10 @@
#ifndef _ACR_ARCH_PRIVATE_H
#define _ACR_ARCH_PRIVATE_H
-#include "acr_arch_private.h"
+/* Platform specific includes
+ */
+#include <sys/stat.h>
+#include <sys/utsname.h>
#ifdef __cplusplus
extern "C" {
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h
(original)
+++
commons/sandbox/runtime/trunk/src/main/native/include/arch/linux/acr_arch_private.h
Mon Apr 20 08:57:55 2009
@@ -17,7 +17,10 @@
#ifndef _ACR_ARCH_PRIVATE_H
#define _ACR_ARCH_PRIVATE_H
-#include "acr_arch_private.h"
+/* Platform specific includes
+ */
+#include <sys/stat.h>
+#include <sys/utsname.h>
#ifdef __cplusplus
extern "C" {
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h
(original)
+++
commons/sandbox/runtime/trunk/src/main/native/include/arch/solaris/acr_arch_private.h
Mon Apr 20 08:57:55 2009
@@ -17,7 +17,10 @@
#ifndef _ACR_ARCH_PRIVATE_H
#define _ACR_ARCH_PRIVATE_H
-#include "acr_arch_private.h"
+/* Platform specific includes
+ */
+#include <sys/stat.h>
+#include <sys/systeminfo.h>
#ifdef __cplusplus
extern "C" {
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
(original)
+++
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
Mon Apr 20 08:57:55 2009
@@ -17,7 +17,16 @@
#ifndef _ACR_ARCH_PRIVATE_H
#define _ACR_ARCH_PRIVATE_H
-#include "acr_arch_private.h"
+/* Platform specific includes
+ */
+#include <psapi.h>
+#include <tlhelp32.h>
+#include <aclapi.h>
+#include <lm.h>
+#include <sddl.h>
+#include <iphlpapi.h>
+#include <userenv.h>
+#include <shellapi.h>
#ifdef __cplusplus
extern "C" {
Modified: commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/darwin/os.c Mon Apr 20
08:57:55 2009
@@ -18,10 +18,6 @@
#include "acr_private.h"
#include "acr_arch.h"
#include "acr_string.h"
-#include <sys/utsname.h>
-#include <sys/sysctl.h>
-#include <mach/machine.h>
-#include <mach-o/arch.h>
#define MAXSIZESYSSTRING 256
static const char unknown[] = "unknown";
Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c Mon Apr 20
08:57:55 2009
@@ -18,7 +18,6 @@
#include "acr_private.h"
#include "acr_arch.h"
#include "acr_string.h"
-#include <sys/utsname.h>
#define MAXSIZESYSSTRING 256
static const char unknown[] = "unknown";
Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c Mon Apr 20
08:57:55 2009
@@ -18,7 +18,6 @@
#include "acr_private.h"
#include "acr_arch.h"
#include "acr_string.h"
-#include <sys/utsname.h>
#define MAXSIZESYSSTRING 256
static const char unknown[] = "unknown";
Modified: commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/solaris/os.c Mon Apr 20
08:57:55 2009
@@ -18,7 +18,6 @@
#include "acr_private.h"
#include "acr_arch.h"
#include "acr_string.h"
-#include <sys/systeminfo.h>
#define MAXSIZESYSSTRING 256
static const char unknown[] = "unknown";
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/file.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/file.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/file.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/file.c Mon Apr 20
08:57:55 2009
@@ -16,6 +16,7 @@
#include "acr.h"
#include "acr_private.h"
+#include "acr_arch.h"
#include "acr_error.h"
#include "acr_string.h"
#include "acr_file.h"
Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/main.c Mon Apr 20
08:57:55 2009
@@ -16,6 +16,7 @@
#include "acr.h"
#include "acr_private.h"
+#include "acr_arch.h"
#include "acr_error.h"
#include "acr_vm.h"
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/file.c Mon Apr 20
08:57:55 2009
@@ -16,6 +16,7 @@
#include "acr.h"
#include "acr_private.h"
+#include "acr_arch.h"
#include "acr_error.h"
#include "acr_string.h"
#include "acr_file.h"
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/main.c Mon Apr 20
08:57:55 2009
@@ -16,6 +16,7 @@
#include "acr.h"
#include "acr_private.h"
+#include "acr_arch.h"
#include "acr_error.h"
#include "acr_vm.h"
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c Mon Apr 20
08:57:55 2009
@@ -16,6 +16,7 @@
#include "acr.h"
#include "acr_private.h"
+#include "acr_arch.h"
#include "acr_error.h"
#include "acr_string.h"
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/syslog.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/syslog.c?rev=766626&r1=766625&r2=766626&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/syslog.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/syslog.c Mon Apr 20
08:57:55 2009
@@ -16,6 +16,7 @@
#include "acr.h"
#include "acr_private.h"
+#include "acr_arch.h"
#include "acr_error.h"
#include "acr_string.h"