svn commit: r1934433 - in apr/apr/trunk: crypto file_io/unix include include/arch/unix misc/unix mmap/unix network_io/unix passwd support/unix test threadproc/unix time/unix
[email protected] Wed, 20 May 2026 12:16:17 -0000
| Newsgroups | gmane.comp.apache.apr.cvs |
|---|---|
| Message-ID | <177927937789.1214340.857743517745063931@svn03-he-fi> |
Author: ivan
Date: Wed May 20 12:16:17 2026
New Revision: 1934433
Log:
Remove BeOS related code from generic (unix) sources.
Modified:
apr/apr/trunk/crypto/apr_passwd.c
apr/apr/trunk/file_io/unix/dir.c
apr/apr/trunk/file_io/unix/filestat.c
apr/apr/trunk/file_io/unix/pipe.c
apr/apr/trunk/include/apr_mmap.h
apr/apr/trunk/include/apr_portable.h
apr/apr/trunk/include/arch/unix/apr_arch_file_io.h
apr/apr/trunk/include/arch/unix/apr_arch_misc.h
apr/apr/trunk/misc/unix/errorcodes.c
apr/apr/trunk/misc/unix/otherchild.c
apr/apr/trunk/misc/unix/start.c
apr/apr/trunk/mmap/unix/common.c
apr/apr/trunk/mmap/unix/mmap.c
apr/apr/trunk/network_io/unix/sockaddr.c
apr/apr/trunk/network_io/unix/sockets.c
apr/apr/trunk/network_io/unix/sockopt.c
apr/apr/trunk/passwd/apr_getpass.c
apr/apr/trunk/support/unix/waitio.c
apr/apr/trunk/test/testdso.c
apr/apr/trunk/test/testpass.c
apr/apr/trunk/threadproc/unix/procsup.c
apr/apr/trunk/time/unix/time.c
Modified: apr/apr/trunk/crypto/apr_passwd.c
==============================================================================
--- apr/apr/trunk/crypto/apr_passwd.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/crypto/apr_passwd.c Wed May 20 12:16:17 2026 (r1934433)
@@ -39,7 +39,7 @@
static const char * const apr1_id = "$apr1$";
-#if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#if !defined(WIN32) && !defined(NETWARE)
#if defined(APU_CRYPT_THREADSAFE) || !APR_HAS_THREADS || \
defined(CRYPT_R_CRYPTD) || defined(CRYPT_R_STRUCT_CRYPT_DATA)
@@ -92,7 +92,7 @@ static void crypt_mutex_unlock()
#endif
#endif
-#if defined(WIN32) || defined(BEOS) || defined(__ANDROID__)
+#if defined(WIN32) || defined(__ANDROID__)
#define CRYPT_MISSING 1
#else
#define CRYPT_MISSING 0
Modified: apr/apr/trunk/file_io/unix/dir.c
==============================================================================
--- apr/apr/trunk/file_io/unix/dir.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/file_io/unix/dir.c Wed May 20 12:16:17 2026 (r1934433)
@@ -129,7 +129,7 @@ static apr_filetype_e filetype_from_dire
case DT_FIFO:
return APR_PIPE;
#endif
-#if !defined(BEOS) && defined(DT_SOCK)
+#if defined(DT_SOCK)
case DT_SOCK:
return APR_SOCK;
#endif
Modified: apr/apr/trunk/file_io/unix/filestat.c
==============================================================================
--- apr/apr/trunk/file_io/unix/filestat.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/file_io/unix/filestat.c Wed May 20 12:16:17 2026 (r1934433)
@@ -43,7 +43,7 @@ static apr_filetype_e filetype_from_mode
case S_IFFIFO:
type = APR_PIPE; break;
#endif
-#if !defined(BEOS) && defined(S_IFSOCK)
+#if defined(S_IFSOCK)
case S_IFSOCK:
type = APR_SOCK; break;
#endif
@@ -57,7 +57,7 @@ static apr_filetype_e filetype_from_mode
type = APR_PIPE;
} else
#endif
-#if !defined(BEOS) && !defined(S_IFSOCK) && defined(S_ISSOCK)
+#if !defined(S_IFSOCK) && defined(S_ISSOCK)
if (S_ISSOCK(mode)) {
type = APR_SOCK;
} else
Modified: apr/apr/trunk/file_io/unix/pipe.c
==============================================================================
--- apr/apr/trunk/file_io/unix/pipe.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/file_io/unix/pipe.c Wed May 20 12:16:17 2026 (r1934433)
@@ -20,22 +20,8 @@
#include "apr_arch_inherit.h"
-/* Figure out how to get pipe block/nonblock on BeOS...
- * Basically, BONE7 changed things again so that ioctl didn't work,
- * but now fcntl does, hence we need to do this extra checking.
- * The joys of beta programs. :-)
- */
-#if defined(BEOS)
-#if !defined(BONE7)
-# define BEOS_BLOCKING 1
-#else
-# define BEOS_BLOCKING 0
-#endif
-#endif
-
static apr_status_t pipeblock(apr_file_t *thepipe)
{
-#if !defined(BEOS) || !BEOS_BLOCKING
int fd_flags;
fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
@@ -52,18 +38,6 @@ static apr_status_t pipeblock(apr_file_t
if (fcntl(thepipe->filedes, F_SETFL, fd_flags) == -1) {
return errno;
}
-#else /* BEOS_BLOCKING */
-
-# if BEOS_BONE /* This only works on BONE 0-6 */
- int on = 0;
- if (ioctl(thepipe->filedes, FIONBIO, &on, sizeof(on)) < 0) {
- return errno;
- }
-# else /* "classic" BeOS doesn't support this at all */
- return APR_ENOTIMPL;
-# endif
-
-#endif /* !BEOS_BLOCKING */
thepipe->blocking = BLK_ON;
return APR_SUCCESS;
@@ -71,7 +45,6 @@ static apr_status_t pipeblock(apr_file_t
static apr_status_t pipenonblock(apr_file_t *thepipe)
{
-#if !defined(BEOS) || !BEOS_BLOCKING
int fd_flags = fcntl(thepipe->filedes, F_GETFL, 0);
# if defined(O_NONBLOCK)
@@ -88,19 +61,6 @@ static apr_status_t pipenonblock(apr_fil
return errno;
}
-#else /* BEOS_BLOCKING */
-
-# if BEOS_BONE /* This only works on BONE 0-6 */
- int on = 1;
- if (ioctl(thepipe->filedes, FIONBIO, &on, sizeof(on)) < 0) {
- return errno;
- }
-# else /* "classic" BeOS doesn't support this at all */
- return APR_ENOTIMPL;
-# endif
-
-#endif /* !BEOS_BLOCKING */
-
thepipe->blocking = BLK_OFF;
return APR_SUCCESS;
}
Modified: apr/apr/trunk/include/apr_mmap.h
==============================================================================
--- apr/apr/trunk/include/apr_mmap.h Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/include/apr_mmap.h Wed May 20 12:16:17 2026 (r1934433)
@@ -28,10 +28,6 @@
#include "apr_ring.h"
#include "apr_file_io.h" /* for apr_file_t */
-#ifdef BEOS
-#include <kernel/OS.h>
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -53,19 +49,15 @@ typedef struct apr_mmap_t apr
/**
* @remark
* As far as I can tell the only really sane way to store an MMAP is as a
- * void * and a length. BeOS requires this area_id, but that's just a little
- * something extra. I am exposing this type, because it doesn't make much
- * sense to keep it private, and opening it up makes some stuff easier in
- * Apache.
+ * void * and a length. I am exposing this type, because it doesn't make
+ * much sense to keep it private, and opening it up makes some stuff easier
+ * in Apache.
*/
/** The MMAP structure */
struct apr_mmap_t {
/** The pool the mmap structure was allocated out of. */
apr_pool_t *cntxt;
-#if defined(BEOS)
- /** An area ID. Only valid on BeOS */
- area_id area;
-#elif defined(WIN32)
+#if defined(WIN32)
/** The handle of the file mapping */
HANDLE mhandle;
/** The start of the real memory page area (mapped view) */
Modified: apr/apr/trunk/include/apr_portable.h
==============================================================================
--- apr/apr/trunk/include/apr_portable.h Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/include/apr_portable.h Wed May 20 12:16:17 2026 (r1934433)
@@ -87,27 +87,6 @@ typedef struct tm apr_os_exp
typedef HMODULE apr_os_dso_handle_t;
typedef void* apr_os_shm_t;
-#elif defined(__BEOS__)
-#include <kernel/OS.h>
-#include <kernel/image.h>
-
-struct apr_os_proc_mutex_t {
- sem_id sem;
- int32 ben;
-};
-
-typedef int apr_os_file_t;
-typedef DIR apr_os_dir_t;
-typedef int apr_os_sock_t;
-typedef struct apr_os_proc_mutex_t apr_os_proc_mutex_t;
-typedef thread_id apr_os_thread_t;
-typedef thread_id apr_os_proc_t;
-typedef int apr_os_threadkey_t;
-typedef struct timeval apr_os_imp_time_t;
-typedef struct tm apr_os_exp_time_t;
-typedef image_id apr_os_dso_handle_t;
-typedef void* apr_os_shm_t;
-
#else
/* Any other OS should go above this one. This is the lowest common
* denominator typedefs for all UNIX-like systems. :)
Modified: apr/apr/trunk/include/arch/unix/apr_arch_file_io.h
==============================================================================
--- apr/apr/trunk/include/arch/unix/apr_arch_file_io.h Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/include/arch/unix/apr_arch_file_io.h Wed May 20 12:16:17 2026 (r1934433)
@@ -69,22 +69,13 @@
#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
-#ifdef BEOS
-#include <kernel/OS.h>
-#endif
/* Hunting down DEV_BSIZE if not from dirent.h, sys/stat.h etc */
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
-#if BEOS_BONE
-# ifndef BONE7
- /* prior to BONE/7 fd_set & select were defined in sys/socket.h */
-# include <sys/socket.h>
-# else
- /* Be moved the fd_set stuff and also the FIONBIO definition... */
-# include <sys/ioctl.h>
-# endif
+#if APR_HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
#endif
/* End System headers */
Modified: apr/apr/trunk/include/arch/unix/apr_arch_misc.h
==============================================================================
--- apr/apr/trunk/include/arch/unix/apr_arch_misc.h Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/include/arch/unix/apr_arch_misc.h Wed May 20 12:16:17 2026 (r1934433)
@@ -45,10 +45,6 @@
#include <string.h>
#endif
-#ifdef BEOS
-#include <kernel/OS.h>
-#endif
-
struct apr_other_child_rec_t {
apr_pool_t *p;
struct apr_other_child_rec_t *next;
Modified: apr/apr/trunk/misc/unix/errorcodes.c
==============================================================================
--- apr/apr/trunk/misc/unix/errorcodes.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/misc/unix/errorcodes.c Wed May 20 12:16:17 2026 (r1934433)
@@ -437,7 +437,7 @@ static char *apr_os_strerror(char* buf,
}
#endif
-#if defined(HAVE_STRERROR_R) && defined(STRERROR_R_RC_INT) && !defined(BEOS)
+#if defined(HAVE_STRERROR_R) && defined(STRERROR_R_RC_INT)
/* AIX and Tru64 style */
static char *native_strerror(apr_status_t statcode, char *buf,
apr_size_t bufsize)
@@ -453,14 +453,6 @@ static char *native_strerror(apr_status_
#elif defined(HAVE_STRERROR_R)
/* glibc style */
-/* BeOS has the function available, but it doesn't provide
- * the prototype publicly (doh!), so to avoid a build warning
- * we add a suitable prototype here.
- */
-#if defined(BEOS)
-const char *strerror_r(apr_status_t, char *, apr_size_t);
-#endif
-
static char *native_strerror(apr_status_t statcode, char *buf,
apr_size_t bufsize)
{
Modified: apr/apr/trunk/misc/unix/otherchild.c
==============================================================================
--- apr/apr/trunk/misc/unix/otherchild.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/misc/unix/otherchild.c Wed May 20 12:16:17 2026 (r1934433)
@@ -30,9 +30,6 @@
#if APR_HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
-#ifdef BEOS
-#include <sys/socket.h> /* for fd_set definition! */
-#endif
static apr_other_child_rec_t *other_children = NULL;
Modified: apr/apr/trunk/misc/unix/start.c
==============================================================================
--- apr/apr/trunk/misc/unix/start.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/misc/unix/start.c Wed May 20 12:16:17 2026 (r1934433)
@@ -47,7 +47,7 @@ APR_DECLARE(apr_status_t) apr_initialize
return APR_SUCCESS;
}
-#if !defined(BEOS) && !defined(OS2)
+#if !defined(OS2)
apr_proc_mutex_unix_setup_lock();
apr_unix_setup_time();
#endif
Modified: apr/apr/trunk/mmap/unix/common.c
==============================================================================
--- apr/apr/trunk/mmap/unix/common.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/mmap/unix/common.c Wed May 20 12:16:17 2026 (r1934433)
@@ -28,7 +28,7 @@
#include "apr_mmap.h"
#include "apr_errno.h"
-#if APR_HAS_MMAP || defined(BEOS)
+#if APR_HAS_MMAP
APR_DECLARE(apr_status_t) apr_mmap_offset(void **addr, apr_mmap_t *mmap,
apr_off_t offset)
Modified: apr/apr/trunk/mmap/unix/mmap.c
==============================================================================
--- apr/apr/trunk/mmap/unix/mmap.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/mmap/unix/mmap.c Wed May 20 12:16:17 2026 (r1934433)
@@ -26,9 +26,6 @@
#include "apr_portable.h"
/* System headers required for the mmap library */
-#ifdef BEOS
-#include <kernel/OS.h>
-#endif
#if APR_HAVE_STRING_H
#include <string.h>
#endif
@@ -45,7 +42,7 @@
#include <sys/mman.h>
#endif
-#if APR_HAS_MMAP || defined(BEOS)
+#if APR_HAS_MMAP
static apr_status_t mmap_cleanup(void *themmap)
{
@@ -63,11 +60,7 @@ static apr_status_t mmap_cleanup(void *t
return APR_SUCCESS;
}
-#ifdef BEOS
- rv = delete_area(mm->area);
-#else
rv = munmap((char *)mm->mm - mm->poffset, mm->size + mm->poffset);
-#endif
mm->mm = (void *)-1;
if (rv == 0) {
@@ -82,14 +75,9 @@ APR_DECLARE(apr_status_t) apr_mmap_creat
apr_pool_t *cont)
{
void *mm;
-#ifdef BEOS
- area_id aid = -1;
- uint32 pages = 0;
-#else
static long psize;
apr_off_t poffset = 0;
apr_int32_t native_flags = 0;
-#endif
#if APR_HAS_LARGE_FILES && defined(HAVE_MMAP64)
#define mmap mmap64
@@ -106,30 +94,6 @@ APR_DECLARE(apr_status_t) apr_mmap_creat
return APR_EBADF;
(*new) = (apr_mmap_t *)apr_pcalloc(cont, sizeof(apr_mmap_t));
-#ifdef BEOS
- /* XXX: mmap shouldn't really change the seek offset */
- apr_file_seek(file, APR_SET, &offset);
-
- /* There seems to be some strange interactions that mean our area must
- * be set as READ & WRITE or writev will fail! Go figure...
- * So we ignore the value in flags and always ask for both READ and WRITE
- */
- pages = (size + B_PAGE_SIZE -1) / B_PAGE_SIZE;
- aid = create_area("apr_mmap", &mm , B_ANY_ADDRESS, pages * B_PAGE_SIZE,
- B_NO_LOCK, B_WRITE_AREA|B_READ_AREA);
-
- if (aid < B_NO_ERROR) {
- /* we failed to get an area we can use... */
- *new = NULL;
- return APR_ENOMEM;
- }
-
- if (aid >= B_NO_ERROR)
- read(file->filedes, mm, size);
-
- (*new)->area = aid;
-#else
-
if (flag & APR_MMAP_WRITE) {
native_flags |= PROT_WRITE;
}
@@ -158,7 +122,6 @@ APR_DECLARE(apr_status_t) apr_mmap_creat
}
mm = (char *)mm + poffset;
-#endif
(*new)->mm = mm;
(*new)->size = size;
Modified: apr/apr/trunk/network_io/unix/sockaddr.c
==============================================================================
--- apr/apr/trunk/network_io/unix/sockaddr.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/network_io/unix/sockaddr.c Wed May 20 12:16:17 2026 (r1934433)
@@ -534,7 +534,7 @@ static apr_status_t find_addresses(apr_s
apr_sockaddr_t *prev_sa;
int curaddr;
#if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \
- defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS)
+ defined(HAVE_GETHOSTBYNAME_R)
#ifdef GETHOSTBYNAME_R_HOSTENT_DATA
struct hostent_data hd;
#else
@@ -565,7 +565,7 @@ static apr_status_t find_addresses(apr_s
}
else {
#if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \
- defined(HAVE_GETHOSTBYNAME_R) && !defined(BEOS)
+ defined(HAVE_GETHOSTBYNAME_R)
#if defined(GETHOSTBYNAME_R_HOSTENT_DATA)
/* AIX, HP/UX, D/UX et alia */
gethostbyname_r(hostname, &hs, &hd);
@@ -805,7 +805,7 @@ APR_DECLARE(apr_status_t) apr_getnameinf
return APR_SUCCESS;
#else
#if APR_HAS_THREADS && !defined(GETHOSTBYADDR_IS_THREAD_SAFE) && \
- defined(HAVE_GETHOSTBYADDR_R) && !defined(BEOS)
+ defined(HAVE_GETHOSTBYADDR_R)
#ifdef GETHOSTBYNAME_R_HOSTENT_DATA
struct hostent_data hd;
#else
Modified: apr/apr/trunk/network_io/unix/sockets.c
==============================================================================
--- apr/apr/trunk/network_io/unix/sockets.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/network_io/unix/sockets.c Wed May 20 12:16:17 2026 (r1934433)
@@ -21,11 +21,6 @@
#include "apr_portable.h"
#include "apr_arch_inherit.h"
-#ifdef BEOS_R5
-#undef close
-#define close closesocket
-#endif /* BEOS_R5 */
-
#if APR_HAVE_SOCKADDR_UN
#define GENERIC_INADDR_ANY_LEN sizeof(struct sockaddr_un)
#else
@@ -81,12 +76,6 @@ static void set_socket_vars(apr_socket_t
apr_sockaddr_vars_set(sock->local_addr, family, 0);
apr_sockaddr_vars_set(sock->remote_addr, family, 0);
sock->options = 0;
-#if defined(BEOS) && !defined(BEOS_BONE)
- /* BeOS pre-BONE has TCP_NODELAY on by default and it can't be
- * switched off!
- */
- sock->options |= APR_TCP_NODELAY;
-#endif
}
static void alloc_socket(apr_socket_t **new, apr_pool_t *p)
@@ -137,28 +126,7 @@ apr_status_t apr_socket_create(apr_socke
#endif
alloc_socket(new, cont);
-#ifndef BEOS_R5
(*new)->socketdes = socket(family, type|flags, protocol);
-#else
- /* For some reason BeOS R5 has an unconventional protocol numbering,
- * so we need to translate here. */
- switch (protocol) {
- case 0:
- (*new)->socketdes = socket(family, type|flags, 0);
- break;
- case APR_PROTO_TCP:
- (*new)->socketdes = socket(family, type|flags, IPPROTO_TCP);
- break;
- case APR_PROTO_UDP:
- (*new)->socketdes = socket(family, type|flags, IPPROTO_UDP);
- break;
- case APR_PROTO_SCTP:
- default:
- errno = EPROTONOSUPPORT;
- (*new)->socketdes = -1;
- break;
- }
-#endif /* BEOS_R5 */
#if APR_HAVE_IPV6
if ((*new)->socketdes < 0 && ofamily == APR_UNSPEC) {
Modified: apr/apr/trunk/network_io/unix/sockopt.c
==============================================================================
--- apr/apr/trunk/network_io/unix/sockopt.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/network_io/unix/sockopt.c Wed May 20 12:16:17 2026 (r1934433)
@@ -20,8 +20,6 @@
static apr_status_t soblock(int sd)
{
-/* BeOS uses setsockopt at present for non blocking... */
-#ifndef BEOS
int fd_flags;
fd_flags = fcntl(sd, F_GETFL, 0);
@@ -37,17 +35,11 @@ static apr_status_t soblock(int sd)
if (fcntl(sd, F_SETFL, fd_flags) == -1) {
return errno;
}
-#else
- int on = 0;
- if (setsockopt(sd, SOL_SOCKET, SO_NONBLOCK, &on, sizeof(int)) < 0)
- return errno;
-#endif /* BEOS */
return APR_SUCCESS;
}
static apr_status_t sononblock(int sd)
{
-#ifndef BEOS
int fd_flags;
fd_flags = fcntl(sd, F_GETFL, 0);
@@ -63,11 +55,6 @@ static apr_status_t sononblock(int sd)
if (fcntl(sd, F_SETFL, fd_flags) == -1) {
return errno;
}
-#else
- int on = 1;
- if (setsockopt(sd, SOL_SOCKET, SO_NONBLOCK, &on, sizeof(int)) < 0)
- return errno;
-#endif /* BEOS */
return APR_SUCCESS;
}
@@ -241,15 +228,6 @@ apr_status_t apr_socket_opt_set(apr_sock
apr_set_option(sock, APR_TCP_NODELAY, on);
}
#else
- /* BeOS pre-BONE has TCP_NODELAY set by default.
- * As it can't be turned off we might as well check if they're asking
- * for it to be turned on!
- */
-#ifdef BEOS
- if (on == 1)
- return APR_SUCCESS;
- else
-#endif
return APR_ENOTIMPL;
#endif
break;
@@ -372,7 +350,6 @@ apr_status_t apr_socket_opt_get(apr_sock
apr_status_t apr_socket_atmark(apr_socket_t *sock, int *atmark)
{
-#ifndef BEOS_R5
int oobmark;
if (ioctl(sock->socketdes, SIOCATMARK, (void*) &oobmark) < 0)
@@ -381,18 +358,11 @@ apr_status_t apr_socket_atmark(apr_socke
*atmark = (oobmark != 0);
return APR_SUCCESS;
-#else /* BEOS_R5 */
- return APR_ENOTIMPL;
-#endif
}
apr_status_t apr_gethostname(char *buf, apr_int32_t len, apr_pool_t *cont)
{
-#ifdef BEOS_R5
- if (gethostname(buf, len) == 0) {
-#else
if (gethostname(buf, len) != 0) {
-#endif
buf[0] = '\0';
return errno;
}
Modified: apr/apr/trunk/passwd/apr_getpass.c
==============================================================================
--- apr/apr/trunk/passwd/apr_getpass.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/passwd/apr_getpass.c Wed May 20 12:16:17 2026 (r1934433)
@@ -83,7 +83,7 @@
#if !defined(HAVE_GETPASS) && !defined(HAVE_GETPASSPHRASE) && !defined(HAVE_GETPASS_R)
-/* MPE, Win32, and BeOS all lack a native getpass() */
+/* MPE and Win32 all lack a native getpass() */
#if !defined(HAVE_TERMIOS_H) && !defined(WIN32)
/*
Modified: apr/apr/trunk/support/unix/waitio.c
==============================================================================
--- apr/apr/trunk/support/unix/waitio.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/support/unix/waitio.c Wed May 20 12:16:17 2026 (r1934433)
@@ -21,8 +21,8 @@
#include "apr_support.h"
/* The only case where we don't use wait_for_io_or_timeout is on
- * pre-BONE BeOS, so this check should be sufficient and simpler */
-#if !defined(BEOS_R5) && !defined(OS2) && APR_FILES_AS_SOCKETS
+ * OS/2, so this check should be sufficient and simpler */
+#if !defined(OS2) && APR_FILES_AS_SOCKETS
#define USE_WAIT_FOR_IO
#endif
Modified: apr/apr/trunk/test/testdso.c
==============================================================================
--- apr/apr/trunk/test/testdso.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/test/testdso.c Wed May 20 12:16:17 2026 (r1934433)
@@ -29,7 +29,7 @@
#if APR_HAS_DSO
-#if defined(BEOS) || defined(__MVS__)
+#if defined(__MVS__)
# define MOD_NAME "mod_test.so"
#elif defined(WIN32)
# define MOD_NAME TESTBINPATH "mod_test.dll"
Modified: apr/apr/trunk/test/testpass.c
==============================================================================
--- apr/apr/trunk/test/testpass.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/test/testpass.c Wed May 20 12:16:17 2026 (r1934433)
@@ -27,7 +27,7 @@
#include "abts.h"
#include "testutil.h"
-#if defined(WIN32) || defined(BEOS)
+#if defined(WIN32)
#define CRYPT_ALGO_SUPPORTED 0
#else
#define CRYPT_ALGO_SUPPORTED 1
Modified: apr/apr/trunk/threadproc/unix/procsup.c
==============================================================================
--- apr/apr/trunk/threadproc/unix/procsup.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/threadproc/unix/procsup.c Wed May 20 12:16:17 2026 (r1934433)
@@ -22,7 +22,7 @@ APR_DECLARE(apr_status_t) apr_proc_detac
return errno;
}
-#if !defined(MPE) && !defined(OS2) && !defined(TPF) && !defined(BEOS)
+#if !defined(MPE) && !defined(OS2) && !defined(TPF)
/* Don't detach for MPE because child processes can't survive the death of
* the parent. */
if (daemonize) {
Modified: apr/apr/trunk/time/unix/time.c
==============================================================================
--- apr/apr/trunk/time/unix/time.c Wed May 20 12:10:03 2026 (r1934432)
+++ apr/apr/trunk/time/unix/time.c Wed May 20 12:16:17 2026 (r1934433)
@@ -228,8 +228,6 @@ APR_DECLARE(void) apr_sleep(apr_interval
{
#ifdef OS2
DosSleep((t + 999) / 1000);
-#elif defined(BEOS)
- snooze(t);
#elif defined(HAVE_NANOSLEEP)
struct timespec ts;
ts.tv_sec = t / APR_USEC_PER_SEC;