You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@apache.org on 2011/05/09 07:28:46 UTC
svn commit: r1100891 [2/2] - in /apr/apr/branches/gstein-pocore: ./
atomic/win32/ build/ file_io/os2/ file_io/win32/ include/
include/arch/netware/ include/arch/os2/ include/arch/win32/ locks/netware/
locks/os2/ misc/netware/ network_io/unix/ network_i...
Modified: apr/apr/branches/gstein-pocore/file_io/win32/pipe.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/file_io/win32/pipe.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/file_io/win32/pipe.c (original)
+++ apr/apr/branches/gstein-pocore/file_io/win32/pipe.c Mon May 9 05:28:45 2011
@@ -29,6 +29,9 @@
#if APR_HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
+#if APR_HAVE_PROCESS_H
+#include <process.h> /* for getpid() on Win32 */
+#endif
#include "apr_arch_misc.h"
APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe,
@@ -43,8 +46,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_
return APR_ENOTIMPL;
}
if (timeout && !(thepipe->pOverlapped)) {
- /* Cannot be nonzero if a pipe was opened blocking
- */
+ /* Cannot be nonzero if a pipe was opened blocking */
return APR_EINVAL;
}
thepipe->timeout = timeout;
@@ -82,7 +84,7 @@ APR_DECLARE(apr_status_t) apr_file_pipe_
char name[50];
sa.nLength = sizeof(sa);
-
+
#if APR_HAS_UNICODE_FS
IF_WIN_OS_IS_UNICODE
sa.bInheritHandle = FALSE;
@@ -139,10 +141,10 @@ APR_DECLARE(apr_status_t) apr_file_pipe_
(*in)->filehand = CreateNamedPipe(name,
dwOpenMode,
dwPipeMode,
- 1, //nMaxInstances,
- 0, //nOutBufferSize,
- 65536, //nInBufferSize,
- 1, //nDefaultTimeOut,
+ 1, /* nMaxInstances, */
+ 0, /* nOutBufferSize, */
+ 65536, /* nInBufferSize, */
+ 1, /* nDefaultTimeOut, */
&sa);
/* Create the write end of the pipe */
@@ -154,14 +156,14 @@ APR_DECLARE(apr_status_t) apr_file_pipe_
(*out)->pOverlapped->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
(*out)->timeout = 0;
}
-
+
(*out)->filehand = CreateFile(name,
- GENERIC_WRITE, // access mode
- 0, // share mode
- &sa, // Security attributes
- OPEN_EXISTING, // dwCreationDisposition
- dwOpenMode, // Pipe attributes
- NULL); // handle to template file
+ GENERIC_WRITE, /* access mode */
+ 0, /* share mode */
+ &sa, /* Security attributes */
+ OPEN_EXISTING, /* dwCreationDisposition */
+ dwOpenMode, /* Pipe attributes */
+ NULL); /* handle to template file */
}
else {
/* Pipes on Win9* are blocking. Live with it. */
@@ -225,3 +227,4 @@ APR_DECLARE(apr_status_t) apr_os_pipe_pu
{
return apr_os_pipe_put_ex(file, thefile, 0, pool);
}
+
Modified: apr/apr/branches/gstein-pocore/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/file_io/win32/readwrite.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/file_io/win32/readwrite.c (original)
+++ apr/apr/branches/gstein-pocore/file_io/win32/readwrite.c Mon May 9 05:28:45 2011
@@ -263,7 +263,7 @@ APR_DECLARE(apr_status_t) apr_file_write
apr_thread_mutex_lock(thefile->mutex);
if (thefile->direction == 0) {
- // Position file pointer for writing at the offset we are logically reading from
+ /* Position file pointer for writing at the offset we are logically reading from */
apr_off_t offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
DWORD offlo = (DWORD)offset;
DWORD offhi = (DWORD)(offset >> 32);
Modified: apr/apr/branches/gstein-pocore/include/apr.h.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/apr.h.in?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/apr.h.in (original)
+++ apr/apr/branches/gstein-pocore/include/apr.h.in Mon May 9 05:28:45 2011
@@ -63,10 +63,10 @@
#define __attribute__(__x)
#endif
#define APR_INLINE
-#define APR_HAS_INLINE 0
+#define APR_HAS_INLINE 0
#else
#define APR_INLINE __inline__
-#define APR_HAS_INLINE 1
+#define APR_HAS_INLINE 1
#endif
#define APR_HAVE_ARPA_INET_H @arpa_ineth@
@@ -83,6 +83,7 @@
#define APR_HAVE_NETINET_SCTP_H @netinet_sctph@
#define APR_HAVE_NETINET_SCTP_UIO_H @netinet_sctp_uioh@
#define APR_HAVE_NETINET_TCP_H @netinet_tcph@
+#define APR_HAVE_PROCESS_H @processh@
#define APR_HAVE_PTHREAD_H @pthreadh@
#define APR_HAVE_SEMAPHORE_H @semaphoreh@
#define APR_HAVE_SIGNAL_H @signalh@
@@ -116,8 +117,39 @@
*/
#if APR_HAVE_WINDOWS_H
-#include <windows.h>
+/* If windows.h was already included, our preferences don't matter.
+ * If not, include a restricted set of windows headers to our tastes.
+ */
+#ifndef _WINDOWS_
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+
+#ifndef NOUSER
+#define NOUSER
+#endif
+#ifndef NOMCX
+#define NOMCX
#endif
+#ifndef NOIME
+#define NOIME
+#endif
+
+/* Impossible to include winsock2.h after winsock.h, while windows.h
+ * attempts to load winsock. Setting _WINSOCKAPI_ will dodge this.
+ */
+#if APR_HAVE_WINSOCK2_H
+#define _WINSOCKAPI_
+#endif
+
+#include <windows.h>
+#endif /* ndef _WINDOWS_ */
+#endif /* APR_HAVE_WINDOWS_H */
#if APR_HAVE_WINSOCK2_H
#include <winsock2.h>
@@ -238,12 +270,12 @@ extern "C" {
#define APR_HAS_SO_ACCEPTFILTER @acceptfilter@
#define APR_HAS_UNICODE_FS @have_unicode_fs@
#define APR_HAS_PROC_INVOKED @have_proc_invoked@
-#define APR_HAS_USER 1
+#define APR_HAS_USER @apr_has_user@
#define APR_HAS_LARGE_FILES @aprlfs@
-#define APR_HAS_XTHREAD_FILES 0
+#define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@
#define APR_HAS_OS_UUID @osuuid@
-#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
+#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@
/* APR sets APR_FILES_AS_SOCKETS to 1 on systems where it is possible
* to poll on files/pipes.
@@ -380,7 +412,7 @@ typedef apr_uint32_t apr_uin
*
* </PRE>
*/
-#define APR_THREAD_FUNC
+#define APR_THREAD_FUNC @apr_thread_func@
/**
* The public APR functions are declared with APR_DECLARE(), so they may
Modified: apr/apr/branches/gstein-pocore/include/apr.hnw
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/apr.hnw?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/apr.hnw (original)
+++ apr/apr/branches/gstein-pocore/include/apr.hnw Mon May 9 05:28:45 2011
@@ -25,19 +25,20 @@
* And please, make an effort to stub apr.hw and apr.h.in in the process.
*
* This is the NetWare specific version of apr.h. It is copied from
- * apr.hnw at the start of a NetWare build by prebuildNW.bat.
+ * apr.hnw at the start of a NetWare build by the ./build/NWGNmakefile.
*/
/**
* @file apr.h
* @brief APR Platform Definitions
* @remark This is a generated header generated from include/apr.h.in by
- * ./configure, or copied from include/apr.hw or include/apr.hnw
+ * ./configure, or copied from include/apr.hw or include/apr.hnw
* for Win32 or Netware by those build environments, respectively.
*/
#if defined(NETWARE) || defined(DOXYGEN)
+#undef FD_SETSIZE
#define FD_SETSIZE 1024
#include <sys/types.h>
@@ -48,21 +49,22 @@
#include <stdlib.h>
#include <string.h>
#include <limits.h>
+#include <netware.h>
#include <nks/thread.h>
#include <nks/synch.h>
#include <nks/time.h>
#include <signal.h>
#ifdef USE_WINSOCK
#include <novsock2.h>
+#ifdef NW_BUILD_IPV6
+#include <novtcpip.h>
+#endif
#else
#include <sys/socket.h>
+#include <sys/select.h>
#endif
#include <sys/types.h>
-#ifdef NW_BUILD_IPV6
-#include <novtcpip.h>
-#endif
-
#define _POSIX_THREAD_SAFE_FUNCTIONS 1
#define READDIR_IS_THREAD_SAFE 1
@@ -74,161 +76,161 @@ extern "C" {
/**
* @defgroup apr_platform Platform Definitions
- * @ingroup APR
+ * @ingroup APR
* @{
*/
-#define APR_INLINE
-#define APR_HAS_INLINE 0
+#define APR_INLINE
+#define APR_HAS_INLINE 0
#ifndef __attribute__
#define __attribute__(__x)
#endif
#define ENUM_BITFIELD(e,n,w) signed int n : w
-#define APR_HAVE_CONIO_H 0
-#define APR_HAVE_CRYPT_H 0
-#define APR_HAVE_CTYPE_H 1
-#define APR_HAVE_DIRENT_H 1
-#define APR_HAVE_ERRNO_H 1
-#define APR_HAVE_FCNTL_H 1
-#define APR_HAVE_IO_H 0
-#define APR_HAVE_LIMITS_H 1
+#define APR_HAVE_CONIO_H 0
+#define APR_HAVE_CRYPT_H 0
+#define APR_HAVE_CTYPE_H 1
+#define APR_HAVE_DIRENT_H 1
+#define APR_HAVE_ERRNO_H 1
+#define APR_HAVE_FCNTL_H 1
+#define APR_HAVE_IO_H 0
+#define APR_HAVE_LIMITS_H 1
#ifdef USE_WINSOCK
-#define APR_HAVE_ARPA_INET_H 0
-#define APR_HAVE_NETDB_H 0
-#define APR_HAVE_NETINET_IN_H 0
-#else
-#define APR_HAVE_ARPA_INET_H 1
-#define APR_HAVE_NETDB_H 1
-#define APR_HAVE_NETINET_IN_H 1
-#endif
-#define APR_HAVE_NETINET_SCTP_H 0
-#define APR_HAVE_NETINET_SCTP_UIO_H 0
-#define APR_HAVE_NETINET_TCP_H 0
-#define APR_HAVE_PTHREAD_H 0
-#define APR_HAVE_SIGNAL_H 1
-#define APR_HAVE_STDARG_H 1
-#define APR_HAVE_STDINT_H 0
-#define APR_HAVE_STDIO_H 1
-#define APR_HAVE_STDLIB_H 1
-#define APR_HAVE_STRING_H 1
-#define APR_HAVE_STRINGS_H 0
-#define APR_HAVE_STRTOLL 1
-#define APR_HAVE_SYS_SENDFILE_H 0
-#define APR_HAVE_SYS_SYSLIMITS_H 0
+#define APR_HAVE_ARPA_INET_H 0
+#define APR_HAVE_NETDB_H 0
+#define APR_HAVE_NETINET_IN_H 0
+#else
+#define APR_HAVE_ARPA_INET_H 1
+#define APR_HAVE_NETDB_H 1
+#define APR_HAVE_NETINET_IN_H 1
+#endif
+#define APR_HAVE_NETINET_SCTP_H 0
+#define APR_HAVE_NETINET_SCTP_UIO_H 0
+#define APR_HAVE_NETINET_TCP_H 0
+#define APR_HAVE_PTHREAD_H 0
+#define APR_HAVE_SIGNAL_H 1
+#define APR_HAVE_STDARG_H 1
+#define APR_HAVE_STDINT_H 0
+#define APR_HAVE_STDIO_H 1
+#define APR_HAVE_STDLIB_H 1
+#define APR_HAVE_STRING_H 1
+#define APR_HAVE_STRINGS_H 0
+#define APR_HAVE_STRTOLL 1
+#define APR_HAVE_SYS_SENDFILE_H 0
+#define APR_HAVE_SYS_SYSLIMITS_H 0
#ifdef USE_WINSOCK
-#define APR_HAVE_SYS_SOCKET_H 0
-#define APR_HAVE_SYS_SOCKIO_H 0
-#define APR_HAVE_SYS_TIME_H 0
-#else
-#define APR_HAVE_SYS_SOCKET_H 1
-#define APR_HAVE_SYS_SOCKIO_H 1
-#define APR_HAVE_SYS_TIME_H 1
-#endif
-#define APR_HAVE_SYS_SIGNAL_H 1
-#define APR_HAVE_SYS_TYPES_H 1
-#define APR_HAVE_SYS_UIO_H 1
-#define APR_HAVE_SYS_UN_H 1
-#define APR_HAVE_SYS_WAIT_H 1
-#define APR_HAVE_TIME_H 1
-#define APR_HAVE_UNISTD_H 1
-
-#define APR_HAVE_SHMEM_MMAP_TMP 0
-#define APR_HAVE_SHMEM_MMAP_SHM 0
-#define APR_HAVE_SHMEM_MMAP_ZERO 0
-#define APR_HAVE_SHMEM_SHMGET_ANON 0
-#define APR_HAVE_SHMEM_SHMGET 0
-#define APR_HAVE_SHMEM_MMAP_ANON 0
-#define APR_HAVE_SHMEM_BEOS 0
-
-#define APR_USE_SHMEM_MMAP_TMP 0
-#define APR_USE_SHMEM_MMAP_SHM 0
-#define APR_USE_SHMEM_MMAP_ZERO 0
-#define APR_USE_SHMEM_SHMGET_ANON 0
-#define APR_USE_SHMEM_SHMGET 0
-#define APR_USE_SHMEM_MMAP_ANON 0
-#define APR_USE_SHMEM_BEOS 0
-
-#define APR_USE_FLOCK_SERIALIZE 0
-#define APR_USE_SYSVSEM_SERIALIZE 0
-#define APR_USE_FCNTL_SERIALIZE 0
-#define APR_USE_PROC_PTHREAD_SERIALIZE 0
-#define APR_USE_PTHREAD_SERIALIZE 0
-
-#define APR_HAS_FLOCK_SERIALIZE 0
-#define APR_HAS_SYSVSEM_SERIALIZE 0
-#define APR_HAS_FCNTL_SERIALIZE 0
-#define APR_HAS_PROC_PTHREAD_SERIALIZE 0
-#define APR_HAS_RWLOCK_SERIALIZE 0
-
-#define APR_HAS_LOCK_CREATE_NP 0
-
-#define APR_PROCESS_LOCK_IS_GLOBAL 1
-
-#define APR_FILE_BASED_SHM 0
-
-#define APR_HAVE_CORKABLE_TCP 0
-#define APR_HAVE_GETRLIMIT 0
-#define APR_HAVE_ICONV 0
-#define APR_HAVE_IN_ADDR 1
-#define APR_HAVE_INET_ADDR 1
-#define APR_HAVE_INET_NETWORK 0
+#define APR_HAVE_SYS_SOCKET_H 0
+#define APR_HAVE_SYS_SOCKIO_H 0
+#define APR_HAVE_SYS_UN_H 0
+#else
+#define APR_HAVE_SYS_SOCKET_H 1
+#define APR_HAVE_SYS_SOCKIO_H 1
+#define APR_HAVE_SYS_UN_H 1
+#endif
+#define APR_HAVE_SYS_SIGNAL_H 1
+#define APR_HAVE_SYS_TIME_H 1
+#define APR_HAVE_SYS_TYPES_H 1
+#define APR_HAVE_SYS_UIO_H 1
+#define APR_HAVE_SYS_WAIT_H 1
+#define APR_HAVE_TIME_H 1
+#define APR_HAVE_UNISTD_H 1
+
+#define APR_HAVE_SHMEM_MMAP_TMP 0
+#define APR_HAVE_SHMEM_MMAP_SHM 0
+#define APR_HAVE_SHMEM_MMAP_ZERO 0
+#define APR_HAVE_SHMEM_SHMGET_ANON 0
+#define APR_HAVE_SHMEM_SHMGET 0
+#define APR_HAVE_SHMEM_MMAP_ANON 0
+#define APR_HAVE_SHMEM_BEOS 0
+
+#define APR_USE_SHMEM_MMAP_TMP 0
+#define APR_USE_SHMEM_MMAP_SHM 0
+#define APR_USE_SHMEM_MMAP_ZERO 0
+#define APR_USE_SHMEM_SHMGET_ANON 0
+#define APR_USE_SHMEM_SHMGET 0
+#define APR_USE_SHMEM_MMAP_ANON 0
+#define APR_USE_SHMEM_BEOS 0
+
+#define APR_USE_FLOCK_SERIALIZE 0
+#define APR_USE_SYSVSEM_SERIALIZE 0
+#define APR_USE_FCNTL_SERIALIZE 0
+#define APR_USE_PROC_PTHREAD_SERIALIZE 0
+#define APR_USE_PTHREAD_SERIALIZE 0
+
+#define APR_HAS_FLOCK_SERIALIZE 0
+#define APR_HAS_SYSVSEM_SERIALIZE 0
+#define APR_HAS_FCNTL_SERIALIZE 0
+#define APR_HAS_PROC_PTHREAD_SERIALIZE 0
+#define APR_HAS_RWLOCK_SERIALIZE 0
+
+#define APR_HAS_LOCK_CREATE_NP 0
+
+#define APR_PROCESS_LOCK_IS_GLOBAL 1
+
+#define APR_FILE_BASED_SHM 0
+
+#define APR_HAVE_CORKABLE_TCP 0
+#define APR_HAVE_GETRLIMIT 0
+#define APR_HAVE_ICONV 0
+#define APR_HAVE_IN_ADDR 1
+#define APR_HAVE_INET_ADDR 1
+#define APR_HAVE_INET_NETWORK 0
#ifdef NW_BUILD_IPV6
-#define APR_HAVE_IPV6 1
+#define APR_HAVE_IPV6 1
#else
-#define APR_HAVE_IPV6 0
+#define APR_HAVE_IPV6 0
#endif
-#define APR_HAVE_MEMCHR 1
-#define APR_HAVE_MEMMOVE 1
-#define APR_HAVE_SETRLIMIT 0
-#define APR_HAVE_SIGACTION 0
-#define APR_HAVE_SIGSUSPEND 0
-#define APR_HAVE_SIGWAIT 0
-#define APR_HAVE_STRCASECMP 1
-#define APR_HAVE_STRDUP 1
-#define APR_HAVE_STRICMP 1
-#define APR_HAVE_STRNCASECMP 1
-#define APR_HAVE_STRNICMP 1
-#define APR_HAVE_STRSTR 1
-#define APR_HAVE_STRUCT_RLIMIT 0
-#define APR_HAVE_UNION_SEMUN 0
-#define APR_HAVE_SCTP 0
-#define APR_HAVE_IOVEC 1
+#define APR_HAVE_MEMCHR 1
+#define APR_HAVE_MEMMOVE 1
+#define APR_HAVE_SETRLIMIT 0
+#define APR_HAVE_SIGACTION 0
+#define APR_HAVE_SIGSUSPEND 0
+#define APR_HAVE_SIGWAIT 0
+#define APR_HAVE_STRCASECMP 1
+#define APR_HAVE_STRDUP 1
+#define APR_HAVE_STRICMP 1
+#define APR_HAVE_STRNCASECMP 1
+#define APR_HAVE_STRNICMP 1
+#define APR_HAVE_STRSTR 1
+#define APR_HAVE_STRUCT_RLIMIT 0
+#define APR_HAVE_UNION_SEMUN 0
+#define APR_HAVE_SCTP 0
+#define APR_HAVE_IOVEC 1
/* APR Feature Macros */
-#define APR_HAS_SHARED_MEMORY 0
-#define APR_HAS_THREADS 1
-#define APR_HAS_SENDFILE 0
-#define APR_HAS_MMAP 0
-#define APR_HAS_FORK 0
-#define APR_HAS_RANDOM 1
-#define APR_HAS_OTHER_CHILD 0
-#define APR_HAS_DSO 1
-#define APR_HAS_SO_ACCEPTFILTER 0
-#define APR_HAS_UNICODE_FS 0
-#define APR_HAS_PROC_INVOKED 0
-#define APR_HAS_USER 1
-#define APR_HAS_LARGE_FILES 1
-#define APR_HAS_XTHREAD_FILES 0
-#define APR_HAS_OS_UUID 0
+#define APR_HAS_SHARED_MEMORY 0
+#define APR_HAS_THREADS 1
+#define APR_HAS_SENDFILE 0
+#define APR_HAS_MMAP 0
+#define APR_HAS_FORK 0
+#define APR_HAS_RANDOM 1
+#define APR_HAS_OTHER_CHILD 0
+#define APR_HAS_DSO 1
+#define APR_HAS_SO_ACCEPTFILTER 0
+#define APR_HAS_UNICODE_FS 0
+#define APR_HAS_PROC_INVOKED 0
+#define APR_HAS_USER 1
+#define APR_HAS_LARGE_FILES 1
+#define APR_HAS_XTHREAD_FILES 0
+#define APR_HAS_OS_UUID 0
#define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD 0
/* Netware can poll on files/pipes.
*/
-#define APR_FILES_AS_SOCKETS 1
+#define APR_FILES_AS_SOCKETS 1
/* This macro indicates whether or not EBCDIC is the native character set.
*/
-#define APR_CHARSET_EBCDIC 0
+#define APR_CHARSET_EBCDIC 0
/* Is the TCP_NODELAY socket option inherited from listening sockets?
*/
-#define APR_TCP_NODELAY_INHERITED 1
+#define APR_TCP_NODELAY_INHERITED 1
/* Is the O_NONBLOCK flag inherited from listening sockets?
*/
-#define APR_O_NONBLOCK_INHERITED 1
+#define APR_O_NONBLOCK_INHERITED 1
/* Typedefs that APR needs. */
@@ -259,7 +261,7 @@ typedef apr_uint64_t apr_ino_t;
/* Are we big endian? */
/* XXX: Fatal assumption on Alpha platforms */
-#define APR_IS_BIGENDIAN 0
+#define APR_IS_BIGENDIAN 0
#ifdef UNKNOWN_NETWARE_64BIT_FLAG_NEEDED
#define APR_SIZEOF_VOIDP 8
@@ -349,8 +351,8 @@ typedef apr_uint32_t apr_uin
#define APR_END_DECLS
#endif
-/**
- * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC,
+/**
+ * Thread callbacks from APR functions must be declared with APR_THREAD_FUNC,
* so that they follow the platform's calling convention.
* @example
*/
@@ -360,7 +362,7 @@ typedef apr_uint32_t apr_uin
/**
* The public APR functions are declared with APR_DECLARE(), so they may
- * use the most appropriate calling convention. Public APR functions with
+ * use the most appropriate calling convention. Public APR functions with
* variable arguments must use APR_DECLARE_NONSTD().
*
* @remark Both the declaration and implementations must use the same macro.
@@ -368,20 +370,20 @@ typedef apr_uint32_t apr_uin
*/
/** APR_DECLARE(rettype) apr_func(args)
* @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
- * @remark Note that when APR compiles the library itself, it passes the
- * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32)
+ * @remark Note that when APR compiles the library itself, it passes the
+ * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32)
* to export public symbols from the dynamic library build.\n
* The user must define the APR_DECLARE_STATIC when compiling to target
- * the static APR library on some platforms (e.g. Win32.) The public symbols
+ * the static APR library on some platforms (e.g. Win32.) The public symbols
* are neither exported nor imported when APR_DECLARE_STATIC is defined.\n
* By default, compiling an application and including the APR public
* headers, without defining APR_DECLARE_STATIC, will prepare the code to be
* linked to the dynamic library.
*/
-#define APR_DECLARE(type) type
+#define APR_DECLARE(type) type
/**
- * The public APR functions using variable arguments are declared with
+ * The public APR functions using variable arguments are declared with
* APR_DECLARE_NONSTD(), as they must follow the C language calling convention.
* @see APR_DECLARE @see APR_DECLARE_DATA
* @remark Both the declaration and implementations must use the same macro.
@@ -392,7 +394,7 @@ typedef apr_uint32_t apr_uin
#define APR_DECLARE_NONSTD(type) type
/**
- * The public APR variables are declared with AP_MODULE_DECLARE_DATA.
+ * The public APR variables are declared with APR_DECLARE_DATA.
* This assures the appropriate indirection is invoked at compile time.
* @see APR_DECLARE @see APR_DECLARE_NONSTD
* @remark Note that the declaration and implementations use different forms,
Modified: apr/apr/branches/gstein-pocore/include/apr_portable.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/apr_portable.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/apr_portable.h (original)
+++ apr/apr/branches/gstein-pocore/include/apr_portable.h Mon May 9 05:28:45 2011
@@ -471,6 +471,10 @@ APR_DECLARE(apr_status_t) apr_os_dso_han
APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *dso,
apr_dso_handle_t *aprdso);
+/** @} */
+#endif /* APR_HAS_DSO */
+
+
#if APR_HAS_OS_UUID
/**
* Private: apr-util's apr_uuid module when supported by the platform
@@ -478,9 +482,6 @@ APR_DECLARE(apr_status_t) apr_os_dso_han
APR_DECLARE(apr_status_t) apr_os_uuid_get(unsigned char *uuid_data);
#endif
-/** @} */
-#endif /* APR_HAS_DSO */
-
/**
* Get the name of the system default character set.
Modified: apr/apr/branches/gstein-pocore/include/apr_want.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/apr_want.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/apr_want.h (original)
+++ apr/apr/branches/gstein-pocore/include/apr_want.h Mon May 9 05:28:45 2011
@@ -89,19 +89,16 @@
#else
+#ifndef APR_IOVEC_DEFINED
+#define APR_IOVEC_DEFINED
struct iovec
{
char *iov_base;
size_t iov_len;
};
+#endif /* !APR_IOVEC_DEFINED */
-#endif
-
-/* apr_want is included at several layers; redefining APR_HAVE_IOVEC
- * now to ensure that our struct is not introduced several times.
- */
-#undef APR_HAVE_IOVEC
-#define APR_HAVE_IOVEC 1
+#endif /* APR_HAVE_IOVEC */
#undef APR_WANT_IOVEC
#endif
Modified: apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_file_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_file_io.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_file_io.h (original)
+++ apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_file_io.h Mon May 9 05:28:45 2011
@@ -165,6 +165,9 @@ apr_status_t filepath_compare_drive(cons
apr_status_t apr_unix_file_cleanup(void *);
apr_status_t apr_unix_child_file_cleanup(void *);
+mode_t apr_unix_perms2mode(apr_fileperms_t perms);
+apr_fileperms_t apr_unix_mode2perms(mode_t mode);
+
apr_status_t apr_file_flush_locked(apr_file_t *thefile);
apr_status_t apr_file_info_get_locked(apr_finfo_t *finfo, apr_int32_t wanted,
apr_file_t *thefile);
Modified: apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_pre_nw.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_pre_nw.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_pre_nw.h (original)
+++ apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_pre_nw.h Mon May 9 05:28:45 2011
@@ -1,16 +1,3 @@
-#ifndef __pre_nw__
-#define __pre_nw__
-
-#include <stdint.h>
-
-#ifndef __GNUC__
-#pragma precompile_target "precomp.mch"
-#endif
-
-#define NETWARE
-
-#define N_PLAT_NLM
-
/* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -26,6 +13,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#ifndef __pre_nw__
+#define __pre_nw__
+
+#include <stdint.h>
+
+#ifndef __GNUC__
+#pragma precompile_target "precomp.mch"
+#endif
+
+#define NETWARE
+
+#define N_PLAT_NLM
+
#define FAR
#define far
@@ -51,16 +51,6 @@
#define __int64 long long
#endif
-/* expat version */
-#define VERSION "expat_1.95.1"
-#define EXPAT_MAJOR_VERSION 1
-#define EXPAT_MINOR_VERSION 95
-#define EXPAT_EDIT 2
-
-#define XML_MAJOR_VERSION EXPAT_MAJOR_VERSION
-#define XML_MINOR_VERSION EXPAT_MINOR_VERSION
-#define XML_MICRO_VERSION EXPAT_EDIT
-
#endif
Modified: apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_threadproc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_threadproc.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_threadproc.h (original)
+++ apr/apr/branches/gstein-pocore/include/arch/netware/apr_arch_threadproc.h Mon May 9 05:28:45 2011
@@ -68,11 +68,13 @@ struct apr_thread_once_t {
unsigned long value;
};
-//struct apr_proc_t {
-// apr_pool_t *pool;
-// pid_t pid;
-// apr_procattr_t *attr;
-//};
+/*
+struct apr_proc_t {
+ apr_pool_t *pool;
+ pid_t pid;
+ apr_procattr_t *attr;
+};
+*/
#endif /* ! THREAD_PROC_H */
Modified: apr/apr/branches/gstein-pocore/include/arch/netware/apr_private.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/arch/netware/apr_private.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/arch/netware/apr_private.h (original)
+++ apr/apr/branches/gstein-pocore/include/arch/netware/apr_private.h Mon May 9 05:28:45 2011
@@ -16,8 +16,8 @@
/*
* Note:
- * This is the windows specific autoconf-like config file
- * which unix would create at build time.
+ * This is the netware-specific autoconf-like config file
+ * which unix creates at ./configure time.
*/
#ifdef NETWARE
@@ -25,10 +25,16 @@
#ifndef APR_PRIVATE_H
#define APR_PRIVATE_H
-/* Include the public APR symbols, include our idea of the 'right'
- * subset of the Windows.h header. This saves us repetition.
+/* Pick up publicly advertised headers and symbols before the
+ * APR internal private headers and symbols
*/
-#include "apr.h"
+#include <apr.h>
+
+/* Pick up privately consumed headers */
+#include <ndkvers.h>
+
+/* Include alloca.h to get compiler-dependent defines */
+#include <alloca.h>
#include <sys/types.h>
#include <stddef.h>
@@ -72,16 +78,13 @@
#define HAVE_GETPASS_R 1
/*
- * check for older NDKs which have only the getpassword() function.
+ * Hack around older NDKs which have only the getpassword() function,
+ * a threadsafe, API-equivilant of getpass_r().
*/
-#include <ndkvers.h>
#if (CURRENT_NDK_THRESHOLD < 709060000)
-#define getpass_r getpassword
+#define getpass_r getpassword
#endif
-/* 64-bit integer conversion function */
-#define APR_INT64_STRFN strtoll
-
/*#define DSO_USE_DLFCN */
#ifdef NW_BUILD_IPV6
@@ -97,8 +100,8 @@
/* 6 is used for SIGTERM on netware */
/* 7 is used for SIGPOLL on netware */
+#if (CURRENT_NDK_THRESHOLD < 306030000)
#define SIGKILL 11
-#define SA_NOCLDSTOP 12
#define SIGALRM 13
#define SIGCHLD 14
#define SIGCONT 15
@@ -111,10 +114,10 @@
#define SIGTTOU 22
#define SIGUSR1 23
#define SIGUSR2 24
-
+#endif
+
#define SIGTRAP 25
#define SIGIOT 26
-#define SIGBUS 27
#define SIGSTKFLT 28
#define SIGURG 29
#define SIGXCPU 30
@@ -124,29 +127,23 @@
#define SIGWINCH 34
#define SIGIO 35
-#if 0
-#define __attribute__(__x)
-
-/* APR COMPATABILITY FUNCTIONS
- * This section should be used to define functions and
- * macros which are need to make Windows features look
- * like POSIX features.
- */
-typedef void (Sigfunc)(int);
+#if (CURRENT_NDK_THRESHOLD < 406230000)
+#undef SA_NOCLDSTOP
+#define SA_NOCLDSTOP 0x00000001
+#endif
+#ifndef SIGBUS
+#define SIGBUS SIGSEGV
#endif
-#define strcasecmp(s1, s2) stricmp(s1, s2)
-#define Sleep(t) delay(t)
-#define lstat(a,b) stat(a,b)
-#define _getch() getcharacter()
+#define _getch getcharacter
-#define SIZEOF_SHORT 2
-#define SIZEOF_INT 4
-#define SIZEOF_LONGLONG 8
-#define SIZEOF_CHAR 1
-#define SIZEOF_SSIZE_T SIZEOF_INT
+#define SIZEOF_SHORT 2
+#define SIZEOF_INT 4
+#define SIZEOF_LONGLONG 8
+#define SIZEOF_CHAR 1
+#define SIZEOF_SSIZE_T SIZEOF_INT
-void netware_pool_proc_cleanup ();
+void netware_pool_proc_cleanup();
/* NLM registration routines for managing which NLMs
are using the library. */
@@ -183,15 +180,21 @@ void* getStatCache();
and can be shared by the library. */
#undef malloc
#define malloc(x) library_malloc(gLibHandle,x)
+#ifndef __MWERKS__
+#define _alloca alloca
+#endif
+
+/* 64-bit integer conversion function */
+#define APR_INT64_STRFN strtoll
#if APR_HAS_LARGE_FILES
-#define APR_OFF_T_STRFN strtoll
+#define APR_OFF_T_STRFN strtoll
#else
-#define APR_OFF_T_STRFN strtol
+#define APR_OFF_T_STRFN strtol
#endif
/* used to check DWORD overflow for 64bit compiles */
-#define APR_DWORD_MAX 0xFFFFFFFFUL
+#define APR_DWORD_MAX 0xFFFFFFFFUL
/*
* Include common private declarations.
Modified: apr/apr/branches/gstein-pocore/include/arch/os2/apr_arch_file_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/arch/os2/apr_arch_file_io.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/arch/os2/apr_arch_file_io.h (original)
+++ apr/apr/branches/gstein-pocore/include/arch/os2/apr_arch_file_io.h Mon May 9 05:28:45 2011
@@ -49,12 +49,13 @@ struct apr_file_t {
/* Stuff for buffered mode */
char *buffer;
- apr_size_t bufsize; // Read/Write position in buffer
- apr_size_t bufpos; // Read/Write position in buffer
- unsigned long dataRead; // amount of valid data read into buffer
- int direction; // buffer being used for 0 = read, 1 = write
- unsigned long filePtr; // position in file of handle
- apr_thread_mutex_t *mutex;// mutex semaphore, must be owned to access the above fields
+ apr_size_t bufsize; /* Read/Write position in buffer */
+ apr_size_t bufpos; /* Read/Write position in buffer */
+ unsigned long dataRead; /* amount of valid data read into buffer */
+ int direction; /* buffer being used for 0 = read, 1 = write */
+ unsigned long filePtr; /* position in file of handle */
+ apr_thread_mutex_t *mutex; /* mutex semaphore, must be owned to access
+ the above fields */
};
struct apr_dir_t {
Modified: apr/apr/branches/gstein-pocore/include/arch/win32/apr_arch_file_io.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/arch/win32/apr_arch_file_io.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/arch/win32/apr_arch_file_io.h (original)
+++ apr/apr/branches/gstein-pocore/include/arch/win32/apr_arch_file_io.h Mon May 9 05:28:45 2011
@@ -155,13 +155,13 @@ apr_status_t more_finfo(apr_finfo_t *fin
* correctly when writing to a file with this flag set TRUE.
*/
-// for apr_poll.c;
+/* for apr_poll.c */
#define filedes filehand
struct apr_file_t {
apr_pool_t *pool;
HANDLE filehand;
- BOOLEAN pipe; // Is this a pipe of a file?
+ BOOLEAN pipe; /* Is this a pipe of a file? */
OVERLAPPED *pOverlapped;
apr_interval_time_t timeout;
apr_int32_t flags;
Modified: apr/apr/branches/gstein-pocore/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/include/arch/win32/apr_arch_misc.h?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/branches/gstein-pocore/include/arch/win32/apr_arch_misc.h Mon May 9 05:28:45 2011
@@ -66,7 +66,7 @@ struct apr_other_child_rec_t {
*/
extern int APR_DECLARE_DATA apr_app_init_complete;
-int apr_wastrtoastr(char const * const * *retarr,
+int apr_wastrtoastr(char const * const * *retarr,
wchar_t const * const *arr, int args);
/* Platform specific designation of run time os version.
@@ -74,38 +74,38 @@ int apr_wastrtoastr(char const * const *
* export new kernel or winsock functions or behavior.
*/
typedef enum {
- APR_WIN_UNK = 0,
- APR_WIN_UNSUP = 1,
- APR_WIN_95 = 10,
- APR_WIN_95_B = 11,
- APR_WIN_95_OSR2 = 12,
- APR_WIN_98 = 14,
- APR_WIN_98_SE = 16,
- APR_WIN_ME = 18,
-
- APR_WIN_UNICODE = 20, /* Prior versions support only narrow chars */
-
- APR_WIN_CE_3 = 23, /* CE is an odd beast, not supporting */
- /* some pre-NT features, such as the */
- APR_WIN_NT = 30, /* narrow charset APIs (fooA fns), while */
- APR_WIN_NT_3_5 = 35, /* not supporting some NT-family features. */
- APR_WIN_NT_3_51 = 36,
-
- APR_WIN_NT_4 = 40,
- APR_WIN_NT_4_SP2 = 42,
- APR_WIN_NT_4_SP3 = 43,
- APR_WIN_NT_4_SP4 = 44,
- APR_WIN_NT_4_SP5 = 45,
- APR_WIN_NT_4_SP6 = 46,
-
- APR_WIN_2000 = 50,
- APR_WIN_2000_SP1 = 51,
- APR_WIN_2000_SP2 = 52,
- APR_WIN_XP = 60,
- APR_WIN_XP_SP1 = 61,
- APR_WIN_XP_SP2 = 62,
- APR_WIN_2003 = 70,
- APR_WIN_VISTA = 80
+ APR_WIN_UNK = 0,
+ APR_WIN_UNSUP = 1,
+ APR_WIN_95 = 10,
+ APR_WIN_95_B = 11,
+ APR_WIN_95_OSR2 = 12,
+ APR_WIN_98 = 14,
+ APR_WIN_98_SE = 16,
+ APR_WIN_ME = 18,
+
+ APR_WIN_UNICODE = 20, /* Prior versions support only narrow chars */
+
+ APR_WIN_CE_3 = 23, /* CE is an odd beast, not supporting */
+ /* some pre-NT features, such as the */
+ APR_WIN_NT = 30, /* narrow charset APIs (fooA fns), while */
+ APR_WIN_NT_3_5 = 35, /* not supporting some NT-family features. */
+ APR_WIN_NT_3_51 = 36,
+
+ APR_WIN_NT_4 = 40,
+ APR_WIN_NT_4_SP2 = 42,
+ APR_WIN_NT_4_SP3 = 43,
+ APR_WIN_NT_4_SP4 = 44,
+ APR_WIN_NT_4_SP5 = 45,
+ APR_WIN_NT_4_SP6 = 46,
+
+ APR_WIN_2000 = 50,
+ APR_WIN_2000_SP1 = 51,
+ APR_WIN_2000_SP2 = 52,
+ APR_WIN_XP = 60,
+ APR_WIN_XP_SP1 = 61,
+ APR_WIN_XP_SP2 = 62,
+ APR_WIN_2003 = 70,
+ APR_WIN_VISTA = 80
} apr_oslevel_e;
extern APR_DECLARE_DATA apr_oslevel_e apr_os_level;
@@ -172,13 +172,13 @@ static APR_INLINE void* apr_realloc_dbg(
#endif /* ! _MSC_VER */
typedef enum {
- DLL_WINBASEAPI = 0, // kernel32 From WinBase.h
- DLL_WINADVAPI = 1, // advapi32 From WinBase.h
- DLL_WINSOCKAPI = 2, // mswsock From WinSock.h
- DLL_WINSOCK2API = 3, // ws2_32 From WinSock2.h
- DLL_SHSTDAPI = 4, // shell32 From ShellAPI.h
- DLL_NTDLL = 5, // shell32 From our real kernel
- DLL_defined = 6 // must define as last idx_ + 1
+ DLL_WINBASEAPI = 0, /* kernel32 From WinBase.h */
+ DLL_WINADVAPI = 1, /* advapi32 From WinBase.h */
+ DLL_WINSOCKAPI = 2, /* mswsock From WinSock.h */
+ DLL_WINSOCK2API = 3, /* ws2_32 From WinSock2.h */
+ DLL_SHSTDAPI = 4, /* shell32 From ShellAPI.h */
+ DLL_NTDLL = 5, /* shell32 From our real kernel */
+ DLL_defined = 6 /* must define as last idx_ + 1 */
} apr_dlltoken_e;
FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
@@ -273,8 +273,8 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI,
OUT PACL *ppDacl,
OUT PACL *ppSacl,
OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
- (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup,
- ppDacl, ppSacl, ppSecurityDescriptor));
+ (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup,
+ ppDacl, ppSacl, ppSecurityDescriptor));
#define GetNamedSecurityInfoW apr_winapi_GetNamedSecurityInfoW
APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetNamedSecurityInfoA, 0, (
@@ -286,8 +286,8 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI,
OUT PACL *ppDacl,
OUT PACL *ppSacl,
OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
- (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup,
- ppDacl, ppSacl, ppSecurityDescriptor));
+ (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup,
+ ppDacl, ppSacl, ppSecurityDescriptor));
#define GetNamedSecurityInfoA apr_winapi_GetNamedSecurityInfoA
#undef GetNamedSecurityInfo
#define GetNamedSecurityInfo apr_winapi_GetNamedSecurityInfoA
@@ -301,12 +301,12 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI,
OUT PACL *ppDacl,
OUT PACL *ppSacl,
OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
- (handle, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup,
- ppDacl, ppSacl, ppSecurityDescriptor));
+ (handle, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup,
+ ppDacl, ppSacl, ppSecurityDescriptor));
#define GetSecurityInfo apr_winapi_GetSecurityInfo
APR_DECLARE_LATE_DLL_FUNC(DLL_SHSTDAPI, LPWSTR *, WINAPI, CommandLineToArgvW, 0, (
- LPCWSTR lpCmdLine,
+ LPCWSTR lpCmdLine,
int *pNumArgs),
(lpCmdLine, pNumArgs));
#define CommandLineToArgvW apr_winapi_CommandLineToArgvW
@@ -435,3 +435,4 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI
#endif /* !defined(_WIN32_WCE) */
#endif /* ! MISC_H */
+
Modified: apr/apr/branches/gstein-pocore/locks/netware/thread_rwlock.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/locks/netware/thread_rwlock.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/locks/netware/thread_rwlock.c (original)
+++ apr/apr/branches/gstein-pocore/locks/netware/thread_rwlock.c Mon May 9 05:28:45 2011
@@ -34,12 +34,12 @@ APR_DECLARE(apr_status_t) apr_thread_rwl
{
apr_thread_rwlock_t *new_rwlock = NULL;
- NXHierarchy_t hierarchy = 1; //for libc NKS NXRwLockAlloc
- NXLockInfo_t *info; //for libc NKS NXRwLockAlloc
+ NXHierarchy_t hierarchy = 1; /* for libc NKS NXRwLockAlloc */
+ NXLockInfo_t *info; /* for libc NKS NXRwLockAlloc */
new_rwlock = (apr_thread_rwlock_t *)apr_pcalloc(pool, sizeof(apr_thread_rwlock_t));
-
- if(new_rwlock ==NULL) {
+
+ if(new_rwlock ==NULL) {
return APR_ENOMEM;
}
new_rwlock->pool = pool;
Modified: apr/apr/branches/gstein-pocore/locks/os2/proc_mutex.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/locks/os2/proc_mutex.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/locks/os2/proc_mutex.c (original)
+++ apr/apr/branches/gstein-pocore/locks/os2/proc_mutex.c Mon May 9 05:28:45 2011
@@ -32,7 +32,7 @@ static char *fixed_name(const char *fnam
if (fname == NULL)
semname = NULL;
else {
- // Semaphores don't live in the file system, fix up the name
+ /* Semaphores don't live in the file system, fix up the name */
while (*fname == '/' || *fname == '\\') {
fname++;
}
Modified: apr/apr/branches/gstein-pocore/misc/netware/libprews.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/misc/netware/libprews.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/misc/netware/libprews.c (original)
+++ apr/apr/branches/gstein-pocore/misc/netware/libprews.c Mon May 9 05:28:45 2011
@@ -16,12 +16,10 @@
#include <netware.h>
#include <library.h>
#include <nks/synch.h>
-#ifdef USE_WINSOCK
-#include "novsock2.h"
-#endif
#include "apr_pools.h"
#include "apr_private.h"
+#include "apr_arch_internal_time.h"
/* library-private data...*/
Modified: apr/apr/branches/gstein-pocore/misc/netware/start.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/misc/netware/start.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/misc/netware/start.c (original)
+++ apr/apr/branches/gstein-pocore/misc/netware/start.c Mon May 9 05:28:45 2011
@@ -22,8 +22,20 @@
#include "apr_arch_misc.h" /* for WSAHighByte / WSALowByte */
#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
#include "apr_arch_internal_time.h"
+#include "apr_ldap.h" /* for apr_ldap_rebind_init() */
#ifdef USE_WINSOCK
+/* Prototypes missing from older NDKs */
+int WSAStartupRTags(WORD wVersionRequested,
+ LPWSADATA lpWSAData,
+ rtag_t WSAStartupRTag,
+ rtag_t WSPSKTRTag,
+ rtag_t lookUpServiceBeginRTag,
+ rtag_t WSAEventRTag,
+ rtag_t WSPCPRTag);
+
+int WSACleanupRTag(rtag_t rTag);
+
/*
** Resource tag signatures for using NetWare WinSock 2. These will no longer
** be needed by anyone once the new WSAStartupWithNlmHandle() is available
@@ -38,7 +50,6 @@
int (*WSAStartupWithNLMHandle)( WORD version, LPWSADATA data, void *handle ) = NULL;
int (*WSACleanupWithNLMHandle)( void *handle ) = NULL;
-apr_status_t apr_ldap_rebind_init(apr_pool_t *pool);
static int wsa_startup_with_handle (WORD wVersionRequested, LPWSADATA data, void *handle)
{
@@ -124,7 +135,6 @@ APR_DECLARE(apr_status_t) apr_app_initia
APR_DECLARE(apr_status_t) apr_initialize(void)
{
apr_pool_t *pool;
- int err;
void *nlmhandle = getnlmhandle();
/* Register the NLM as using APR. If it is already
@@ -144,15 +154,18 @@ APR_DECLARE(apr_status_t) apr_initialize
apr_pool_tag(pool, "apr_initilialize");
#ifdef USE_WINSOCK
- err = RegisterAppWithWinSock (nlmhandle);
-
- if (err) {
- return err;
+ {
+ int err;
+ if ((err = RegisterAppWithWinSock (nlmhandle))) {
+ return err;
+ }
}
#endif
apr_signal_init(pool);
+#if APR_HAS_LDAP
apr_ldap_rebind_init(pool);
+#endif
return APR_SUCCESS;
}
Modified: apr/apr/branches/gstein-pocore/network_io/unix/sockets.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/network_io/unix/sockets.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/network_io/unix/sockets.c (original)
+++ apr/apr/branches/gstein-pocore/network_io/unix/sockets.c Mon May 9 05:28:45 2011
@@ -338,18 +338,18 @@ apr_status_t apr_socket_connect(apr_sock
#endif /* SO_ERROR */
}
- if (rc == -1 && errno != EISCONN) {
- return errno;
- }
if (memcmp(sa->ipaddr_ptr, generic_inaddr_any, sa->ipaddr_len)) {
/* A real remote address was passed in. If the unspecified
* address was used, the actual remote addr will have to be
* determined using getpeername() if required. */
- /* ### this should probably be a structure copy + fixup as per
- * _accept()'s handling of local_addr */
- sock->remote_addr = sa;
sock->remote_addr_unknown = 0;
+
+ /* Copy the address structure details in. */
+ sock->remote_addr->sa = sa->sa;
+ sock->remote_addr->salen = sa->salen;
+ /* Adjust ipaddr_ptr et al. */
+ apr_sockaddr_vars_set(sock->remote_addr, sa->family, sa->port);
}
if (sock->local_addr->port == 0) {
@@ -364,6 +364,11 @@ apr_status_t apr_socket_connect(apr_sock
*/
sock->local_interface_unknown = 1;
}
+
+ if (rc == -1 && errno != EISCONN) {
+ return errno;
+ }
+
#ifndef HAVE_POLL
sock->connected=1;
#endif
Modified: apr/apr/branches/gstein-pocore/network_io/win32/sockopt.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/network_io/win32/sockopt.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/network_io/win32/sockopt.c (original)
+++ apr/apr/branches/gstein-pocore/network_io/win32/sockopt.c Mon May 9 05:28:45 2011
@@ -20,7 +20,7 @@
#include "apr_strings.h"
#include <string.h>
-apr_status_t soblock(SOCKET sd)
+static apr_status_t soblock(SOCKET sd)
{
u_long zero = 0;
@@ -30,7 +30,7 @@ apr_status_t soblock(SOCKET sd)
return APR_SUCCESS;
}
-apr_status_t sononblock(SOCKET sd)
+static apr_status_t sononblock(SOCKET sd)
{
u_long one = 1;
Modified: apr/apr/branches/gstein-pocore/passwd/apr_getpass.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/passwd/apr_getpass.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/passwd/apr_getpass.c (original)
+++ apr/apr/branches/gstein-pocore/passwd/apr_getpass.c Mon May 9 05:28:45 2011
@@ -34,9 +34,13 @@
#include <unistd.h>
#endif
#if APR_HAVE_CONIO_H
+#ifdef _MSC_VER
#pragma warning(disable: 4032)
#include <conio.h>
#pragma warning(default: 4032)
+#else
+#include <conio.h>
+#endif
#endif
#if APR_HAVE_STDLIB_H
#include <stdlib.h>
@@ -49,8 +53,12 @@
#endif
/* Disable getpass() support when PASS_MAX is defined and is "small",
- * for an arbitrary definition of "small". */
-#if defined(HAVE_GETPASS) && defined(PASS_MAX) && PASS_MAX < 32
+ * for an arbitrary definition of "small".
+ * HP-UX truncates passwords (PR49496) so we disable getpass() for
+ * this platform too.
+ */
+#if defined(HAVE_GETPASS) && \
+ (defined(PASS_MAX) && PASS_MAX < 32) || defined(__hpux) || defined(__hpux__)
#undef HAVE_GETPASS
#endif
Modified: apr/apr/branches/gstein-pocore/test/NWGNUaprtest
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUaprtest?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUaprtest (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUaprtest Mon May 9 05:28:45 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -122,12 +122,12 @@ NLM_STACK_SIZE = 524288
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -223,7 +223,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -254,7 +254,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
@netware.imp \
$(EOLIST)
@@ -282,7 +282,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -296,6 +296,6 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Propchange: apr/apr/branches/gstein-pocore/test/NWGNUaprtest
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+/apr/apr/branches/1.3.x/test/NWGNUaprtest:952760-1100890
/apr/apr/branches/1.4.x/test/nwgnuaprtest:783970
-/apr/apr/trunk/test/NWGNUaprtest:794485,795267,799497,800627,809854,829490,831641,908427,910419
+/apr/apr/trunk/test/NWGNUaprtest:793193,794485,795267,799497,800627,809854,829490,831641,908427,910419,983618
/apr/apr/trunk/test/nwgnuaprtest:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/gstein-pocore/test/NWGNUechod
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUechod?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUechod (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUechod Mon May 9 05:28:45 2011
@@ -123,12 +123,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -209,7 +209,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
Modified: apr/apr/branches/gstein-pocore/test/NWGNUglobalmutexchild
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUglobalmutexchild?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUglobalmutexchild (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUglobalmutexchild Mon May 9 05:28:45 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -125,12 +125,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -250,5 +250,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Propchange: apr/apr/branches/gstein-pocore/test/NWGNUglobalmutexchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+/apr/apr/branches/1.3.x/test/NWGNUglobalmutexchild:952760-1100890
/apr/apr/branches/1.4.x/test/nwgnuglobalmutexchild:783970
-/apr/apr/trunk/test/NWGNUglobalmutexchild:794485,795267,799497,800627,809854,829490,831641,908427,910419
+/apr/apr/trunk/test/NWGNUglobalmutexchild:793193,794485,795267,799497,800627,809854,829490,831641,908427,910419,983618
/apr/apr/trunk/test/nwgnuglobalmutexchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/gstein-pocore/test/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUmakefile?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUmakefile (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUmakefile Mon May 9 05:28:45 2011
@@ -10,7 +10,7 @@ SUBDIRS = \
# paths to tools
#
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
#
# build this level's files
@@ -41,10 +41,10 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
- copy $(OBJDIR)\*.nlm $(INSTALLBASE)
+ $(call COPY,$(OBJDIR)/*.nlm,$(INSTALLBASE))
#
# Any specialized rules here
@@ -55,5 +55,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Modified: apr/apr/branches/gstein-pocore/test/NWGNUmod_test
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUmod_test?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUmod_test (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUmod_test Mon May 9 05:28:45 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -125,12 +125,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -239,7 +239,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -252,5 +252,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Propchange: apr/apr/branches/gstein-pocore/test/NWGNUmod_test
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+/apr/apr/branches/1.3.x/test/NWGNUmod_test:952760-1100890
/apr/apr/branches/1.4.x/test/nwgnumod_test:783970
-/apr/apr/trunk/test/NWGNUmod_test:794485,795267,799497,800627,809854,829490,831641,908427,910419
+/apr/apr/trunk/test/NWGNUmod_test:793193,794485,795267,799497,800627,809854,829490,831641,908427,910419,983618
/apr/apr/trunk/test/nwgnumod_test:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/gstein-pocore/test/NWGNUproc_child
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUproc_child?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUproc_child (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUproc_child Mon May 9 05:28:45 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -125,12 +125,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -250,5 +250,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Propchange: apr/apr/branches/gstein-pocore/test/NWGNUproc_child
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+/apr/apr/branches/1.3.x/test/NWGNUproc_child:952760-1100890
/apr/apr/branches/1.4.x/test/nwgnuproc_child:783970
-/apr/apr/trunk/test/NWGNUproc_child:794485,795267,799497,800627,809854,829490,831641,908427,910419
+/apr/apr/trunk/test/NWGNUproc_child:793193,794485,795267,799497,800627,809854,829490,831641,908427,910419,983618
/apr/apr/trunk/test/nwgnuproc_child:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/gstein-pocore/test/NWGNUreadchild
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUreadchild?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUreadchild (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUreadchild Mon May 9 05:28:45 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -125,12 +125,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -250,5 +250,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Propchange: apr/apr/branches/gstein-pocore/test/NWGNUreadchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+/apr/apr/branches/1.3.x/test/NWGNUreadchild:952760-1100890
/apr/apr/branches/1.4.x/test/nwgnureadchild:783970
-/apr/apr/trunk/test/NWGNUreadchild:794485,795267,799497,800627,809854,829490,831641,908427,910419
+/apr/apr/trunk/test/NWGNUreadchild:793193,794485,795267,799497,800627,809854,829490,831641,908427,910419,983618
/apr/apr/trunk/test/nwgnureadchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/gstein-pocore/test/NWGNUsockchild
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUsockchild?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUsockchild (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUsockchild Mon May 9 05:28:45 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -125,12 +125,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -250,5 +250,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Propchange: apr/apr/branches/gstein-pocore/test/NWGNUsockchild
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+/apr/apr/branches/1.3.x/test/NWGNUsockchild:952760-1100890
/apr/apr/branches/1.4.x/test/nwgnusockchild:783970
-/apr/apr/trunk/test/NWGNUsockchild:794485,795267,799497,800627,809854,829490,831641,908427,910419
+/apr/apr/trunk/test/NWGNUsockchild:793193,794485,795267,799497,800627,809854,829490,831641,908427,910419,983618
/apr/apr/trunk/test/nwgnusockchild:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/gstein-pocore/test/NWGNUsockperf
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUsockperf?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUsockperf (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUsockperf Mon May 9 05:28:45 2011
@@ -123,12 +123,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -209,7 +209,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
Modified: apr/apr/branches/gstein-pocore/test/NWGNUtestatmc
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUtestatmc?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUtestatmc (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUtestatmc Mon May 9 05:28:45 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -122,12 +122,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -177,7 +177,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -208,7 +208,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
@netware.imp \
$(EOLIST)
@@ -236,7 +236,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -250,5 +250,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Propchange: apr/apr/branches/gstein-pocore/test/NWGNUtestatmc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+/apr/apr/branches/1.3.x/test/NWGNUtestatmc:952760-1100890
/apr/apr/branches/1.4.x/test/nwgnutestatmc:783970
-/apr/apr/trunk/test/NWGNUtestatmc:794485,795267,799497,800627,809854,829490,831641,908427,910419
+/apr/apr/trunk/test/NWGNUtestatmc:793193,794485,795267,799497,800627,809854,829490,831641,908427,910419,983618
/apr/apr/trunk/test/nwgnutestatmc:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/gstein-pocore/test/NWGNUtryread
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/NWGNUtryread?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/NWGNUtryread (original)
+++ apr/apr/branches/gstein-pocore/test/NWGNUtryread Mon May 9 05:28:45 2011
@@ -8,7 +8,7 @@
#
ifndef EnvironmentDefined
-include $(APR_WORK)\build\NWGNUhead.inc
+include $(APR_WORK)/build/NWGNUhead.inc
endif
#
@@ -125,12 +125,12 @@ NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM = _LibCPrelude
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM = _LibCPostlude
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -179,7 +179,7 @@ FILES_nlm_objs = \
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
- libcpre.o \
+ $(PRELUDE) \
$(EOLIST)
#
@@ -210,7 +210,7 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @$(APR)/aprlib.imp \
+ @aprlib.imp \
@libc.imp \
$(EOLIST)
@@ -237,7 +237,7 @@ nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
-# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
+# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
@@ -250,5 +250,5 @@ install :: nlms FORCE
# in this makefile
#
-include $(APR_WORK)\build\NWGNUtail.inc
+include $(APRBUILD)/NWGNUtail.inc
Propchange: apr/apr/branches/gstein-pocore/test/NWGNUtryread
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+/apr/apr/branches/1.3.x/test/NWGNUtryread:952760-1100890
/apr/apr/branches/1.4.x/test/nwgnutryread:783970
-/apr/apr/trunk/test/NWGNUtryread:794485,795267,799497,800627,809854,829490,831641,908427,910419
+/apr/apr/trunk/test/NWGNUtryread:793193,794485,795267,799497,800627,809854,829490,831641,908427,910419,983618
/apr/apr/trunk/test/nwgnutryread:712674,733052,742752,747990,748361,748371,748565,748988,749810,782838,783398,783958,788588
Modified: apr/apr/branches/gstein-pocore/test/nw_misc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/nw_misc.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/nw_misc.c (original)
+++ apr/apr/branches/gstein-pocore/test/nw_misc.c Mon May 9 05:28:45 2011
@@ -1,3 +1,4 @@
+#include <stdio.h>
#include <stdlib.h>
#include <netware.h>
#include <screen.h>
Modified: apr/apr/branches/gstein-pocore/test/testsock.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/test/testsock.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/test/testsock.c (original)
+++ apr/apr/branches/gstein-pocore/test/testsock.c Mon May 9 05:28:45 2011
@@ -267,16 +267,20 @@ static void test_get_addr(abts_case *tc,
apr_status_t rv;
apr_socket_t *ld, *sd, *cd;
apr_sockaddr_t *sa, *ca;
+ apr_pool_t *subp;
char *a, *b;
- ld = setup_socket(tc);
+ APR_ASSERT_SUCCESS(tc, "create subpool", apr_pool_create(&subp, p));
+
+ if ((ld = setup_socket(tc)) != APR_SUCCESS)
+ return;
APR_ASSERT_SUCCESS(tc,
"get local address of bound socket",
apr_socket_addr_get(&sa, APR_LOCAL, ld));
rv = apr_socket_create(&cd, sa->family, SOCK_STREAM,
- APR_PROTO_TCP, p);
+ APR_PROTO_TCP, subp);
APR_ASSERT_SUCCESS(tc, "create client socket", rv);
APR_ASSERT_SUCCESS(tc, "enable non-block mode",
@@ -302,7 +306,7 @@ static void test_get_addr(abts_case *tc,
}
APR_ASSERT_SUCCESS(tc, "accept connection",
- apr_socket_accept(&sd, ld, p));
+ apr_socket_accept(&sd, ld, subp));
{
/* wait for writability */
@@ -322,18 +326,38 @@ static void test_get_addr(abts_case *tc,
APR_ASSERT_SUCCESS(tc, "get local address of server socket",
apr_socket_addr_get(&sa, APR_LOCAL, sd));
-
APR_ASSERT_SUCCESS(tc, "get remote address of client socket",
apr_socket_addr_get(&ca, APR_REMOTE, cd));
-
- a = apr_psprintf(p, "%pI", sa);
- b = apr_psprintf(p, "%pI", ca);
+ /* Test that the pool of the returned sockaddr objects exactly
+ * match the socket. */
+ ABTS_PTR_EQUAL(tc, subp, sa->pool);
+ ABTS_PTR_EQUAL(tc, subp, ca->pool);
+
+ /* Check equivalence. */
+ a = apr_psprintf(p, "%pI fam=%d", sa, sa->family);
+ b = apr_psprintf(p, "%pI fam=%d", ca, ca->family);
ABTS_STR_EQUAL(tc, a, b);
+
+ /* Check pool of returned sockaddr, as above. */
+ APR_ASSERT_SUCCESS(tc, "get local address of client socket",
+ apr_socket_addr_get(&sa, APR_LOCAL, cd));
+ APR_ASSERT_SUCCESS(tc, "get remote address of server socket",
+ apr_socket_addr_get(&ca, APR_REMOTE, sd));
+
+ /* Check equivalence. */
+ a = apr_psprintf(p, "%pI fam=%d", sa, sa->family);
+ b = apr_psprintf(p, "%pI fam=%d", ca, ca->family);
+ ABTS_STR_EQUAL(tc, a, b);
+
+ ABTS_PTR_EQUAL(tc, subp, sa->pool);
+ ABTS_PTR_EQUAL(tc, subp, ca->pool);
apr_socket_close(cd);
apr_socket_close(sd);
apr_socket_close(ld);
+
+ apr_pool_destroy(subp);
}
abts_suite *testsock(abts_suite *suite)
Modified: apr/apr/branches/gstein-pocore/threadproc/netware/proc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/threadproc/netware/proc.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/threadproc/netware/proc.c (original)
+++ apr/apr/branches/gstein-pocore/threadproc/netware/proc.c Mon May 9 05:28:45 2011
@@ -26,7 +26,7 @@
*/
static apr_file_t no_file = { NULL, -1, };
-apr_status_t apr_netware_proc_cleanup(void *theproc)
+static apr_status_t apr_netware_proc_cleanup(void *theproc)
{
apr_proc_t *proc = theproc;
int exit_int;
@@ -448,8 +448,10 @@ APR_DECLARE(apr_status_t) apr_proc_wait(
return errno;
}
-APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, apr_int32_t what,
- struct rlimit *limit)
+#if APR_HAVE_STRUCT_RLIMIT
+APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr,
+ apr_int32_t what,
+ struct rlimit *limit)
{
switch(what) {
case APR_LIMIT_CPU:
@@ -459,13 +461,15 @@ APR_DECLARE(apr_status_t) apr_procattr_l
#else
return APR_ENOTIMPL;
#endif
+
case APR_LIMIT_MEM:
-#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
+#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
attr->limit_mem = limit;
break;
#else
return APR_ENOTIMPL;
#endif
+
case APR_LIMIT_NPROC:
#ifdef RLIMIT_NPROC
attr->limit_nproc = limit;
@@ -473,9 +477,19 @@ APR_DECLARE(apr_status_t) apr_procattr_l
#else
return APR_ENOTIMPL;
#endif
+
+ case APR_LIMIT_NOFILE:
+#ifdef RLIMIT_NOFILE
+ attr->limit_nofile = limit;
+ break;
+#else
+ return APR_ENOTIMPL;
+#endif
+
}
return APR_SUCCESS;
}
+#endif /* APR_HAVE_STRUCT_RLIMIT */
APR_DECLARE(apr_status_t) apr_procattr_user_set(apr_procattr_t *attr,
const char *username,
Modified: apr/apr/branches/gstein-pocore/threadproc/netware/signals.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/threadproc/netware/signals.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/threadproc/netware/signals.c (original)
+++ apr/apr/branches/gstein-pocore/threadproc/netware/signals.c Mon May 9 05:28:45 2011
@@ -15,7 +15,6 @@
*/
#include "apr_arch_threadproc.h"
-#include <nks/thread.h>
#include "apr_private.h"
#include "apr_pools.h"
#include "apr_signal.h"
@@ -64,12 +63,12 @@ static void *signal_thread_func(void *si
return NULL;
}
+#if (APR_HAVE_SIGWAIT || APR_HAVE_SIGSUSPEND)
APR_DECLARE(apr_status_t) apr_setup_signal_thread(void)
{
- int rv = 0;
-
- return rv;
+ return 0;
}
+#endif /* (APR_HAVE_SIGWAIT || APR_HAVE_SIGSUSPEND) */
APR_DECLARE(apr_status_t) apr_signal_block(int signum)
{
Modified: apr/apr/branches/gstein-pocore/threadproc/netware/thread.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/threadproc/netware/thread.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/threadproc/netware/thread.c (original)
+++ apr/apr/branches/gstein-pocore/threadproc/netware/thread.c Mon May 9 05:28:45 2011
@@ -41,7 +41,7 @@ apr_status_t apr_threadattr_create(apr_t
apr_status_t apr_threadattr_detach_set(apr_threadattr_t *attr,apr_int32_t on)
{
attr->detach = on;
- return APR_SUCCESS;
+ return APR_SUCCESS;
}
apr_status_t apr_threadattr_detach_get(apr_threadattr_t *attr)
@@ -71,21 +71,21 @@ static void *dummy_worker(void *opaque)
}
apr_status_t apr_thread_create(apr_thread_t **new,
- apr_threadattr_t *attr,
- apr_thread_start_t func,
- void *data,
- apr_pool_t *pool)
+ apr_threadattr_t *attr,
+ apr_thread_start_t func,
+ void *data,
+ apr_pool_t *pool)
{
apr_status_t stat;
long flags = NX_THR_BIND_CONTEXT;
- char threadName[NX_MAX_OBJECT_NAME_LEN+1];
+ char threadName[NX_MAX_OBJECT_NAME_LEN+1];
size_t stack_size = APR_DEFAULT_STACK_SIZE;
if (attr && attr->thread_name) {
strncpy (threadName, attr->thread_name, NX_MAX_OBJECT_NAME_LEN);
}
else {
- sprintf(threadName, "APR_thread %04ld", ++thread_count);
+ sprintf(threadName, "APR_thread %04ld", ++thread_count);
}
/* An original stack size of 0 will allow NXCreateThread() to
@@ -117,27 +117,26 @@ apr_status_t apr_thread_create(apr_threa
}
(*new)->ctx = NXContextAlloc(
- /* void(*start_routine)(void *arg)*/(void (*)(void *)) dummy_worker,
- /* void *arg */ (*new),
- /* int priority */ NX_PRIO_MED,
- /* NXSize_t stackSize */ stack_size,
- /* long flags */ NX_CTX_NORMAL,
- /* int *error */ &stat);
-
-
- stat = NXContextSetName(
- /* NXContext_t ctx */ (*new)->ctx,
- /* const char *name */ threadName);
-
- stat = NXThreadCreate(
- /* NXContext_t context */ (*new)->ctx,
- /* long flags */ flags,
- /* NXThreadId_t *thread_id */ &(*new)->td);
+ /* void(*start_routine)(void *arg) */ (void (*)(void *)) dummy_worker,
+ /* void *arg */ (*new),
+ /* int priority */ NX_PRIO_MED,
+ /* NXSize_t stackSize */ stack_size,
+ /* long flags */ NX_CTX_NORMAL,
+ /* int *error */ &stat);
+
+ stat = NXContextSetName(
+ /* NXContext_t ctx */ (*new)->ctx,
+ /* const char *name */ threadName);
+
+ stat = NXThreadCreate(
+ /* NXContext_t context */ (*new)->ctx,
+ /* long flags */ flags,
+ /* NXThreadId_t *thread_id */ &(*new)->td);
- if(stat==0)
- return APR_SUCCESS;
+ if (stat == 0)
+ return APR_SUCCESS;
- return(stat);// if error
+ return(stat); /* if error */
}
apr_os_thread_t apr_os_thread_current()
Modified: apr/apr/branches/gstein-pocore/threadproc/unix/proc.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/gstein-pocore/threadproc/unix/proc.c?rev=1100891&r1=1100890&r2=1100891&view=diff
==============================================================================
--- apr/apr/branches/gstein-pocore/threadproc/unix/proc.c (original)
+++ apr/apr/branches/gstein-pocore/threadproc/unix/proc.c Mon May 9 05:28:45 2011
@@ -667,6 +667,7 @@ APR_DECLARE(apr_status_t) apr_proc_wait(
return errno;
}
+#if APR_HAVE_STRUCT_RLIMIT
APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr,
apr_int32_t what,
struct rlimit *limit)
@@ -681,7 +682,7 @@ APR_DECLARE(apr_status_t) apr_procattr_l
#endif
case APR_LIMIT_MEM:
-#if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
+#if defined(RLIMIT_DATA) || defined(RLIMIT_VMEM) || defined(RLIMIT_AS)
attr->limit_mem = limit;
break;
#else
@@ -708,3 +709,5 @@ APR_DECLARE(apr_status_t) apr_procattr_l
return APR_SUCCESS;
}
+#endif /* APR_HAVE_STRUCT_RLIMIT */
+