Author: mturk
Date: Wed Sep 16 07:43:30 2009
New Revision: 815647
URL: http://svn.apache.org/viewvc?rev=815647&view=rev
Log:
Add pid_t typedef'd to int
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch_private.h
commons/sandbox/runtime/trunk/src/main/native/os/win32/posix.c
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h?rev=815647&r1=815646&r2=815647&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
(original)
+++
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
Wed Sep 16 07:43:30 2009
@@ -269,11 +269,6 @@
* ---------------------------------------------------------------------
*/
-struct iovec {
- void *iov_base; /* Starting address */
- size_t iov_len; /* Number of bytes */
-};
-
typedef struct acr_ioh acr_ioh;
typedef int (acr_ioh_cleanup_fn_t)(void *, int, unsigned int);
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=815647&r1=815646&r2=815647&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
Wed Sep 16 07:43:30 2009
@@ -207,10 +207,20 @@
/**
* Functions from posix.c
*/
+typedef int pid_t;
+typedef PSID uid_t;
+typedef PSID gid_t;
+
+struct iovec {
+ void *iov_base; /* Starting address */
+ size_t iov_len; /* Number of bytes */
+};
+
+
#if defined(ACR_ENABLE_TEST)
-ACR_DECLARE(int) getppid(void);
+ACR_DECLARE(pid_t) getppid(void);
#else
-int getppid(void);
+pid_t getppid(void);
#endif
/**
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/posix.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/posix.c?rev=815647&r1=815646&r2=815647&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/posix.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/posix.c Wed Sep 16
07:43:30 2009
@@ -25,12 +25,12 @@
/* Something that is missing from CRT
*/
#if defined(ACR_ENABLE_TEST)
-ACR_DECLARE(int) getppid()
+ACR_DECLARE(pid_t) getppid()
#else
-int getppid()
+pid_t getppid()
#endif
{
- static int ppid = -1;
+ static pid_t ppid = -1;
HANDLE snap;
PROCESSENTRY32W e;