From d3bc8beb4ff9e00c3742ada32788239c3f7988e0 Mon Sep 17 00:00:00 2001 From: Kalle Sommer Nielsen Date: Tue, 29 Aug 2017 22:03:56 +0200 Subject: [PATCH] Removed support for BeOS, development for BeOS was supported 17 years ago. This patch however does not drop support for the BeOS compatible variant, Haiku, see Github PR #2697 which is currently a WiP I intentionally left out some fragments for BeOS in the build system for that seems to be bundles --- NEWS | 1 + TSRM/TSRM.c | 24 -------- TSRM/TSRM.h | 7 --- TSRM/threads.m4 | 85 ++++++++++++-------------- TSRM/tsrm.m4 | 20 +++--- UPGRADING | 1 + ext/opcache/Optimizer/zend_func_info.c | 4 +- ext/pcntl/pcntl.c | 2 +- ext/spl/spl_directory.c | 4 +- ext/standard/basic_functions.c | 12 ++-- ext/standard/dns.c | 4 +- ext/standard/file.c | 2 +- ext/standard/file.h | 2 +- ext/standard/filestat.c | 2 +- ext/standard/microtime.c | 2 +- ext/standard/php_dns.h | 4 +- ext/standard/php_fopen_wrapper.c | 2 +- main/network.c | 14 +---- main/php_reentrancy.h | 2 +- main/reentrancy.c | 12 ---- main/streams/memory.c | 3 - sapi/apache2handler/config.m4 | 7 --- 22 files changed, 73 insertions(+), 143 deletions(-) diff --git a/NEWS b/NEWS index 37d842b1952..aa87b857806 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ PHP NEWS . Redesigned the old ext_skel program written in PHP, run: 'php ext_skel.php' for all options. This means there is no dependencies thrus making it work on Windows out of the box. (Kalle) + . Removed support for BeOS. (Kalle) . Fixed bug #75031 (support append mode in temp/memory streams). (adsr) . Fixed bug #74860 (Uncaught exceptions not being formatted properly when error_log set to "syslog"). (Philip Prindeville) diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index cf72aad70e9..aff1cef84e2 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -110,11 +110,6 @@ static DWORD tls_key; # define tsrm_tls_set(what) TlsSetValue(tls_key, (void*)(what)) # define tsrm_tls_get() TlsGetValue(tls_key) -#elif defined(BETHREADS) -static int32 tls_key; -# define tsrm_tls_set(what) tls_set(tls_key, (void*)(what)) -# define tsrm_tls_get() (tsrm_tls_entry*)tls_get(tls_key) - #else # define tsrm_tls_set(what) # define tsrm_tls_get() NULL @@ -135,8 +130,6 @@ TSRM_API int tsrm_startup(int expected_threads, int expected_resources, int debu st_key_create(&tls_key, 0); #elif defined(TSRM_WIN32) tls_key = TlsAlloc(); -#elif defined(BETHREADS) - tls_key = tls_allocate(); #endif /* ensure singleton */ @@ -587,8 +580,6 @@ TSRM_API THREAD_T tsrm_thread_id(void) return pthread_self(); #elif defined(TSRM_ST) return st_thread_self(); -#elif defined(BETHREADS) - return find_thread(NULL); #endif }/*}}}*/ @@ -608,10 +599,6 @@ TSRM_API MUTEX_T tsrm_mutex_alloc(void) pthread_mutex_init(mutexp,NULL); #elif defined(TSRM_ST) mutexp = st_mutex_new(); -#elif defined(BETHREADS) - mutexp = (beos_ben*)malloc(sizeof(beos_ben)); - mutexp->ben = 0; - mutexp->sem = create_sem(1, "PHP sempahore"); #endif #ifdef THR_DEBUG printf("Mutex created thread: %d\n",mythreadid()); @@ -634,9 +621,6 @@ TSRM_API void tsrm_mutex_free(MUTEX_T mutexp) free(mutexp); #elif defined(TSRM_ST) st_mutex_destroy(mutexp); -#elif defined(BETHREADS) - delete_sem(mutexp->sem); - free(mutexp); #endif } #ifdef THR_DEBUG @@ -664,10 +648,6 @@ TSRM_API int tsrm_mutex_lock(MUTEX_T mutexp) return pthread_mutex_lock(mutexp); #elif defined(TSRM_ST) return st_mutex_lock(mutexp); -#elif defined(BETHREADS) - if (atomic_add(&mutexp->ben, 1) != 0) - return acquire_sem(mutexp->sem); - return 0; #endif }/*}}}*/ @@ -691,10 +671,6 @@ TSRM_API int tsrm_mutex_unlock(MUTEX_T mutexp) return pthread_mutex_unlock(mutexp); #elif defined(TSRM_ST) return st_mutex_unlock(mutexp); -#elif defined(BETHREADS) - if (atomic_add(&mutexp->ben, -1) != 1) - return release_sem(mutexp->sem); - return 0; #endif }/*}}}*/ diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index 2177e924c9f..15ebcd7949e 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -72,13 +72,6 @@ typedef int ts_rsrc_id; #elif defined(TSRM_ST) # define THREAD_T st_thread_t # define MUTEX_T st_mutex_t -#elif defined(BETHREADS) -# define THREAD_T thread_id -typedef struct { - sem_id sem; - int32 ben; -} beos_ben; -# define MUTEX_T beos_ben * #endif #ifdef HAVE_SIGNAL_H diff --git a/TSRM/threads.m4 b/TSRM/threads.m4 index 57b46f251a8..efd8ee4e648 100644 --- a/TSRM/threads.m4 +++ b/TSRM/threads.m4 @@ -103,52 +103,47 @@ dnl -threads gcc (HP-UX) dnl AC_DEFUN([PTHREADS_CHECK],[ -if test "$beos_threads" = "1"; then +save_CFLAGS=$CFLAGS +save_LIBS=$LIBS +PTHREADS_ASSIGN_VARS +PTHREADS_CHECK_COMPILE +LIBS=$save_LIBS +CFLAGS=$save_CFLAGS + +AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[ +ac_cv_pthreads_cflags= +if test "$pthreads_working" != "yes"; then + for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do + ac_save=$CFLAGS + CFLAGS="$CFLAGS $flag" + PTHREADS_CHECK_COMPILE + CFLAGS=$ac_save + if test "$pthreads_checked" = "yes"; then + ac_cv_pthreads_cflags=$flag + break + fi + done +fi +]) + +AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[ +ac_cv_pthreads_lib= +if test "$pthreads_working" != "yes"; then + for lib in pthread pthreads c_r; do + ac_save=$LIBS + LIBS="$LIBS -l$lib" + PTHREADS_CHECK_COMPILE + LIBS=$ac_save + if test "$pthreads_checked" = "yes"; then + ac_cv_pthreads_lib=$lib + break + fi + done +fi +]) + +if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then pthreads_working="yes" - ac_cv_pthreads_cflags="" -else - save_CFLAGS=$CFLAGS - save_LIBS=$LIBS - PTHREADS_ASSIGN_VARS - PTHREADS_CHECK_COMPILE - LIBS=$save_LIBS - CFLAGS=$save_CFLAGS - - AC_CACHE_CHECK(for pthreads_cflags,ac_cv_pthreads_cflags,[ - ac_cv_pthreads_cflags= - if test "$pthreads_working" != "yes"; then - for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do - ac_save=$CFLAGS - CFLAGS="$CFLAGS $flag" - PTHREADS_CHECK_COMPILE - CFLAGS=$ac_save - if test "$pthreads_checked" = "yes"; then - ac_cv_pthreads_cflags=$flag - break - fi - done - fi - ]) - - AC_CACHE_CHECK(for pthreads_lib, ac_cv_pthreads_lib,[ - ac_cv_pthreads_lib= - if test "$pthreads_working" != "yes"; then - for lib in pthread pthreads c_r; do - ac_save=$LIBS - LIBS="$LIBS -l$lib" - PTHREADS_CHECK_COMPILE - LIBS=$ac_save - if test "$pthreads_checked" = "yes"; then - ac_cv_pthreads_lib=$lib - break - fi - done - fi - ]) - - if test "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then - pthreads_working="yes" - fi fi if test "$pthreads_working" = "yes"; then diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index 98aa2b8c912..ea9f9a0da10 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -77,19 +77,15 @@ sinclude(threads.m4) AC_DEFUN([TSRM_CHECK_PTHREADS],[ PTHREADS_CHECK - -if test "$beos_threads" = "1"; then - AC_DEFINE(BETHREADS, 1, Whether to use native BeOS threads) -else - if test "$pthreads_working" != "yes"; then - AC_MSG_ERROR(Your system seems to lack POSIX threads.) - fi - - AC_DEFINE(PTHREADS, 1, Whether to use Pthreads) - - AC_MSG_CHECKING(for POSIX threads) - AC_MSG_RESULT(yes) + +if test "$pthreads_working" != "yes"; then + AC_MSG_ERROR(Your system seems to lack POSIX threads.) fi + +AC_DEFINE(PTHREADS, 1, Whether to use Pthreads) + +AC_MSG_CHECKING(for POSIX threads) +AC_MSG_RESULT(yes) ]) AC_DEFUN([TSRM_THREADS_CHECKS],[ diff --git a/UPGRADING b/UPGRADING index fdffbb7d756..2e99fc2f588 100644 --- a/UPGRADING +++ b/UPGRADING @@ -23,6 +23,7 @@ Core: . The ext_skel utility has been completely redesigned with new options and some old options removed. This is now written in PHP and have no external dependencies. + . Support for BeOS has been dropped. Standard: . getimagesize() and related functions now report the mime type of BMP images diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index 5fdb61e84f7..dc596523550 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -575,7 +575,7 @@ static const func_info_t func_infos[] = { #ifdef HAVE_GETHOSTNAME F1("gethostname", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !(defined(__BEOS__))) +#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC F0("dns_check_record", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), F0("checkdnsrr", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS @@ -689,7 +689,7 @@ static const func_info_t func_infos[] = { F0("socket_set_timeout", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE), #endif F1("socket_get_status", MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY), -#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) +#if HAVE_REALPATH || defined(ZTS) F1("realpath", MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING), #endif #ifdef HAVE_FNMATCH diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index d82fed294a2..f9ea76de4ff 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -622,7 +622,7 @@ PHP_FUNCTION(pcntl_alarm) #define PHP_RUSAGE_PARA(from, to, field) \ add_assoc_long(to, #field, from.field) -#if !defined(_OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */ +#ifndef _OSD_POSIX #define PHP_RUSAGE_SPECIAL(from, to) \ PHP_RUSAGE_PARA(from, to, ru_oublock); \ PHP_RUSAGE_PARA(from, to, ru_inblock); \ diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 470e5b432a6..943b5174a2e 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1279,7 +1279,7 @@ SPL_METHOD(SplFileInfo, getLinkTarget) } /* }}} */ -#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) +#if HAVE_REALPATH || defined(ZTS) /* {{{ proto string SplFileInfo::getRealPath() Return the resolved path */ SPL_METHOD(SplFileInfo, getRealPath) @@ -1947,7 +1947,7 @@ static const zend_function_entry spl_SplFileInfo_functions[] = { SPL_ME(SplFileInfo, isDir, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) SPL_ME(SplFileInfo, isLink, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) SPL_ME(SplFileInfo, getLinkTarget, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) -#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) +#if HAVE_REALPATH || defined(ZTS) SPL_ME(SplFileInfo, getRealPath, arginfo_splfileinfo_void, ZEND_ACC_PUBLIC) #endif SPL_ME(SplFileInfo, getFileInfo, arginfo_info_optinalFileClass, ZEND_ACC_PUBLIC) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index e4f692bfcc0..fdcc50b8602 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -962,7 +962,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_gethostname, 0) ZEND_END_ARG_INFO() #endif -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) +#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1) ZEND_ARG_INFO(0, host) ZEND_ARG_INFO(0, type) @@ -984,7 +984,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_mx, 0, 0, 2) ZEND_END_ARG_INFO() # endif -#endif /* defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) */ +#endif /* defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC */ /* }}} */ /* {{{ exec.c */ @@ -1204,7 +1204,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_fgetcsv, 0, 0, 1) ZEND_ARG_INFO(0, escape) ZEND_END_ARG_INFO() -#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) +#if HAVE_REALPATH || defined(ZTS) ZEND_BEGIN_ARG_INFO(arginfo_realpath, 0) ZEND_ARG_INFO(0, path) ZEND_END_ARG_INFO() @@ -3060,7 +3060,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(gethostname, arginfo_gethostname) #endif -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) +#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC PHP_FE(dns_check_record, arginfo_dns_check_record) PHP_FALIAS(checkdnsrr, dns_check_record, arginfo_dns_check_record) @@ -3189,7 +3189,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data) -#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) +#if HAVE_REALPATH || defined(ZTS) PHP_FE(realpath, arginfo_realpath) #endif @@ -3700,7 +3700,7 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */ php_register_url_stream_wrapper("http", &php_stream_http_wrapper); php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper); -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) +#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS BASIC_MINIT_SUBMODULE(dns) # endif diff --git a/ext/standard/dns.c b/ext/standard/dns.c index ee03a31e25a..68ac495353b 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -304,7 +304,7 @@ static zend_string *php_gethostbyname(char *name) #endif /* HAVE_FULL_DNS_FUNCS || defined(PHP_WIN32) */ /* Note: These functions are defined in ext/standard/dns_win32.c for Windows! */ -#if !defined(PHP_WIN32) && (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) +#if !defined(PHP_WIN32) && HAVE_DNS_SEARCH_FUNC #ifndef HFIXEDSZ #define HFIXEDSZ 12 /* fixed data in header */ @@ -1114,7 +1114,7 @@ PHP_FUNCTION(dns_get_mx) } /* }}} */ #endif /* HAVE_FULL_DNS_FUNCS */ -#endif /* !defined(PHP_WIN32) && (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) */ +#endif /* !defined(PHP_WIN32) && HAVE_DNS_SEARCH_FUNC */ #if HAVE_FULL_DNS_FUNCS || defined(PHP_WIN32) PHP_MINIT_FUNCTION(dns) { diff --git a/ext/standard/file.c b/ext/standard/file.c index d82c2c513e9..6e76f235e29 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -2340,7 +2340,7 @@ out: } /* }}} */ -#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) +#if HAVE_REALPATH || defined(ZTS) /* {{{ proto string realpath(string path) Return the resolved path */ PHP_FUNCTION(realpath) diff --git a/ext/standard/file.h b/ext/standard/file.h index 4a014c7617a..94eafc6daf7 100644 --- a/ext/standard/file.h +++ b/ext/standard/file.h @@ -62,7 +62,7 @@ PHP_FUNCTION(get_meta_tags); PHP_FUNCTION(flock); PHP_FUNCTION(fd_set); PHP_FUNCTION(fd_isset); -#if (!defined(__BEOS__) && HAVE_REALPATH) || defined(ZTS) +#if HAVE_REALPATH || defined(ZTS) PHP_FUNCTION(realpath); #endif #ifdef HAVE_FNMATCH diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index b0d6a9813fd..c762d30e0d4 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -894,7 +894,7 @@ PHPAPI void php_stat(const char *filename, size_t filename_length, int type, zva case S_IFDIR: RETURN_STRING("dir"); case S_IFBLK: RETURN_STRING("block"); case S_IFREG: RETURN_STRING("file"); -#if defined(S_IFSOCK) && !defined(ZEND_WIN32)&&!defined(__BEOS__) +#if defined(S_IFSOCK) && !defined(PHP_WIN32) case S_IFSOCK: RETURN_STRING("socket"); #endif } diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c index 0373a32a5da..aa63a6e42e9 100644 --- a/ext/standard/microtime.c +++ b/ext/standard/microtime.c @@ -136,7 +136,7 @@ PHP_FUNCTION(getrusage) #ifdef PHP_WIN32 /* Windows only implements a limited amount of fields from the rusage struct */ PHP_RUSAGE_PARA(ru_majflt); PHP_RUSAGE_PARA(ru_maxrss); -#elif !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct*/ +#elif !defined(_OSD_POSIX) PHP_RUSAGE_PARA(ru_oublock); PHP_RUSAGE_PARA(ru_inblock); PHP_RUSAGE_PARA(ru_msgsnd); diff --git a/ext/standard/php_dns.h b/ext/standard/php_dns.h index a95e2c0d7e9..8905ff97d42 100644 --- a/ext/standard/php_dns.h +++ b/ext/standard/php_dns.h @@ -65,7 +65,7 @@ PHP_FUNCTION(gethostbynamel); PHP_FUNCTION(gethostname); #endif -#if defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) +#if defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC PHP_FUNCTION(dns_check_record); # if defined(PHP_WIN32) || HAVE_FULL_DNS_FUNCS @@ -74,7 +74,7 @@ PHP_FUNCTION(dns_get_record); PHP_MINIT_FUNCTION(dns); # endif -#endif /* defined(PHP_WIN32) || (HAVE_DNS_SEARCH_FUNC && !defined(__BEOS__)) */ +#endif /* defined(PHP_WIN32) || HAVE_DNS_SEARCH_FUNC */ #ifndef INT16SZ #define INT16SZ 2 diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index 34f5d3afbf9..8e7b95e7399 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -388,7 +388,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa return NULL; } -#if defined(S_IFSOCK) && !defined(WIN32) && !defined(__BEOS__) +#if defined(S_IFSOCK) && !defined(PHP_WIN32) do { zend_stat_t st; memset(&st, 0, sizeof(st)); diff --git a/main/network.c b/main/network.c index 763a84be94a..ab328e7b4f0 100644 --- a/main/network.c +++ b/main/network.c @@ -271,22 +271,19 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka #define O_NONBLOCK O_NDELAY #endif -#if !defined(__BEOS__) -# define HAVE_NON_BLOCKING_CONNECT 1 -# ifdef PHP_WIN32 +#ifdef PHP_WIN32 typedef u_long php_non_blocking_flags_t; # define SET_SOCKET_BLOCKING_MODE(sock, save) \ save = TRUE; ioctlsocket(sock, FIONBIO, &save) # define RESTORE_SOCKET_BLOCKING_MODE(sock, save) \ ioctlsocket(sock, FIONBIO, &save) -# else +#else typedef int php_non_blocking_flags_t; # define SET_SOCKET_BLOCKING_MODE(sock, save) \ save = fcntl(sock, F_GETFL, 0); \ fcntl(sock, F_SETFL, save | O_NONBLOCK) # define RESTORE_SOCKET_BLOCKING_MODE(sock, save) \ fcntl(sock, F_SETFL, save) -# endif #endif /* Connect to a socket using an interruptible connect with optional timeout. @@ -302,7 +299,6 @@ PHPAPI int php_network_connect_socket(php_socket_t sockfd, zend_string **error_string, int *error_code) { -#if HAVE_NON_BLOCKING_CONNECT php_non_blocking_flags_t orig_flags; int n; int error = 0; @@ -380,12 +376,6 @@ ok: } } return ret; -#else - if (asynchronous) { - php_error_docref(NULL, E_WARNING, "Asynchronous connect() not supported on this platform"); - } - return (connect(sockfd, addr, addrlen) == 0) ? 0 : -1; -#endif } /* }}} */ diff --git a/main/php_reentrancy.h b/main/php_reentrancy.h index f66f3c5e3ac..6689662c943 100644 --- a/main/php_reentrancy.h +++ b/main/php_reentrancy.h @@ -91,7 +91,7 @@ char *asctime_r(const struct tm *tm, char *buf); #endif -#if !defined(HAVE_GMTIME_R) && defined(HAVE_GMTIME) || defined(__BEOS__) +#if !defined(HAVE_GMTIME_R) && defined(HAVE_GMTIME) #define PHP_NEED_REENTRANCY 1 PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm); #else diff --git a/main/reentrancy.c b/main/reentrancy.c index b95deca262e..2d2f1307822 100644 --- a/main/reentrancy.c +++ b/main/reentrancy.c @@ -111,18 +111,6 @@ PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm) #endif -#if defined(__BEOS__) - -PHPAPI struct tm *php_gmtime_r(const time_t *const timep, struct tm *p_tm) -{ - /* Modified according to LibC definition */ - if (((struct tm*)gmtime_r(timep, p_tm)) == p_tm) - return (p_tm); - return (NULL); -} - -#endif /* BEOS */ - #if !defined(HAVE_POSIX_READDIR_R) PHPAPI int php_readdir_r(DIR *dirp, struct dirent *entry, diff --git a/main/streams/memory.c b/main/streams/memory.c index 2809e22ed0b..c2127781510 100644 --- a/main/streams/memory.c +++ b/main/streams/memory.c @@ -223,9 +223,6 @@ static int php_stream_memory_stat(php_stream *stream, php_stream_statbuf *ssb) / #ifndef PHP_WIN32 ssb->sb.st_blksize = -1; -#endif - -#if !defined(PHP_WIN32) && !defined(__BEOS__) ssb->sb.st_blocks = -1; #endif diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 2e64b215e5c..31767002875 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -103,13 +103,6 @@ if test "$PHP_APXS2" != "no"; then SAPI_SHARED=libs/libphp7.so INSTALL_IT="$INSTALL_IT $SAPI_SHARED" ;; - *beos*) - if test -f _APP_; then `rm _APP_`; fi - `ln -s $APXS_BINDIR/httpd _APP_` - EXTRA_LIBS="$EXTRA_LIBS _APP_" - PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) - INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" - ;; *) PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"