diff options
author | Kalle Sommer Nielsen <kalle@php.net> | 2016-11-19 10:47:20 +0100 |
---|---|---|
committer | Kalle Sommer Nielsen <kalle@php.net> | 2016-11-19 10:47:20 +0100 |
commit | 1b5b9234a34aa217373479e2cc2faae4ec959433 (patch) | |
tree | 99e7f3c826c3acd6bfac87f22e7a35e5b0db021d | |
parent | 673bbff0e508ea7ad89a9772f8a48dbe92ecc591 (diff) | |
download | php-git-1b5b9234a34aa217373479e2cc2faae4ec959433.tar.gz |
Remove these NetWare leftovers
-rw-r--r-- | main/internal_functions_nw.c | 100 | ||||
-rw-r--r-- | netware/sendmail_nw.h | 19 | ||||
-rw-r--r-- | netware/start.c | 119 |
3 files changed, 0 insertions, 238 deletions
diff --git a/main/internal_functions_nw.c b/main/internal_functions_nw.c deleted file mode 100644 index 75e19ced10..0000000000 --- a/main/internal_functions_nw.c +++ /dev/null @@ -1,100 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2016 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Andi Gutmans <andi@zend.com> | - | Zeev Suraski <zeev@zend.com> | - | Modified for NetWare: Novell, Inc. | - +----------------------------------------------------------------------+ - */ - -/* $Id$ */ - -/* {{{ includes - */ -#include "php.h" -#include "php_main.h" -#include "zend_modules.h" -#include "zend_compile.h" -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> - -#include "ext/bcmath/php_bcmath.h" -#include "ext/gd/php_gd.h" -#include "ext/standard/dl.h" -#include "ext/standard/file.h" -#include "ext/standard/fsock.h" -#include "ext/standard/head.h" -#include "ext/standard/pack.h" -#include "ext/standard/php_browscap.h" -/*#include "ext/standard/php_crypt.h"*/ -#include "ext/standard/php_dir.h" -#include "ext/standard/php_filestat.h" -#include "ext/standard/php_mail.h" -/*#include "ext/standard/php_ext_syslog.h"*/ -#include "ext/standard/php_standard.h" -#include "ext/standard/php_lcg.h" -#include "ext/standard/php_array.h" -#include "ext/standard/php_assert.h" -#include "ext/calendar/php_calendar.h" -/*#include "ext/com/php_COM.h" -#include "ext/com/php_VARIANT.h"*/ -#include "ext/ftp/php_ftp.h" -#include "ext/standard/reg.h" -#include "ext/pcre/php_pcre.h" -/*#include "ext/odbc/php_odbc.h"*/ /* Commented out for now */ -#include "ext/session/php_session.h" -/*#include "ext/xml/php_xml.h" -#include "ext/wddx/php_wddx.h" -#include "ext/mysql/php_mysql.h"*/ /* Commented out for now */ -/* }}} */ - -/* {{{ php_builtin_extensions[] - */ -static zend_module_entry *php_builtin_extensions[] = { - phpext_standard_ptr, -#if HAVE_BCMATH - phpext_bcmath_ptr, -#endif - phpext_calendar_ptr, -/* COM_module_ptr,*/ - phpext_ftp_ptr, -#if defined(MBSTR_ENC_TRANS) - phpext_mbstring_ptr, -#endif -/* phpext_mysql_ptr,*/ /* Commented out for now */ -/* phpext_odbc_ptr, */ /* Commented out for now */ - phpext_pcre_ptr, - phpext_session_ptr, -/* phpext_xml_ptr, - phpext_wddx_ptr */ /* Commented out for now */ -}; -/* }}} */ - -#define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *)) - -PHPAPI int php_register_internal_extensions(void) -{ - return php_register_extensions(php_builtin_extensions, EXTCOUNT); -} - - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ diff --git a/netware/sendmail_nw.h b/netware/sendmail_nw.h deleted file mode 100644 index b88f8e12a1..0000000000 --- a/netware/sendmail_nw.h +++ /dev/null @@ -1,19 +0,0 @@ - -#define closesocket close -#define LPCSTR char * -#define LPSTR char* -#define FAR -#ifdef USE_WINSOCK -#include <novsock2.h> -#else -#include <sys/socket.h> /* For struct sockaddr, 'PF_INET' and 'AF_INET' */ -#include <netinet/in.h> /* For struct sockaddr_in */ -#include <netdb.h> /* For struct hostent */ -#endif /* USE_WINSOCK */ - -typedef int SOCKET; /* Borrowed from winsock\novsock2.h */ -typedef struct sockaddr_in SOCKADDR_IN; -typedef struct sockaddr * LPSOCKADDR; -typedef struct hostent * LPHOSTENT; - -#define INVALID_SOCKET (SOCKET)(~0) /* Borrowed from winsock\novsock2.h */ diff --git a/netware/start.c b/netware/start.c deleted file mode 100644 index 18555a4d88..0000000000 --- a/netware/start.c +++ /dev/null @@ -1,119 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2016 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Novell, Inc. | - +----------------------------------------------------------------------+ - */ - - -#include <library.h> -#include <netware.h> -#include <nks/synch.h> - -void *gLibHandle = (void *) NULL; -rtag_t gAllocTag = (rtag_t) NULL; -NXMutex_t *gLibLock = (NXMutex_t *) NULL; -int gLibId = 0; - - -int DisposeLibraryData( void *data) -{ - return 0; -} - - -int _NonAppStart -( - void *NLMHandle, - void *errorScreen, - const char *cmdLine, - const char *loadDirPath, - size_t uninitializedDataLength, - void *NLMFileHandle, - int (*readRoutineP)( int conn, void *fileHandle, size_t offset, - size_t nbytes, size_t *bytesRead, void *buffer ), - size_t customDataOffset, - size_t customDataSize, - int messageCount, - const char **messages -) -{ - NX_LOCK_INFO_ALLOC(liblock, "Per-Application Data Lock", 0); - -#pragma unused(cmdLine) -#pragma unused(loadDirPath) -#pragma unused(uninitializedDataLength) -#pragma unused(NLMFileHandle) -#pragma unused(readRoutineP) -#pragma unused(customDataOffset) -#pragma unused(customDataSize) -#pragma unused(messageCount) -#pragma unused(messages) - -/* Here we process our command line, post errors (to the error screen), - * perform initializations and anything else we need to do before being able - * to accept calls into us. If we succeed, we return non-zero and the NetWare - * Loader will leave us up, otherwise we fail to load and get dumped. - */ -/** - gAllocTag = AllocateResourceTag(NLMHandle, - "<library-name> memory allocations", AllocSignature); - if (!gAllocTag) { - OutputToScreen(errorScreen, "Unable to allocate resource tag for " - "library memory allocations.\n"); - return -1; - } -**/ - gLibId = register_library(DisposeLibraryData); - if (gLibId == -1) { - OutputToScreen(errorScreen, "Unable to register library with kernel.\n"); - return -1; - } - - gLibHandle = NLMHandle; - - gLibLock = NXMutexAlloc(0, 0, &liblock); - if (!gLibLock) { - OutputToScreen(errorScreen, "Unable to allocate library data lock.\n"); - return -1; - } - - return 0; -} - - -void _NonAppStop( void ) -{ -/* Here we clean up any resources we allocated. Resource tags is a big part - * of what we created, but NetWare doesn't ask us to free those. - */ - (void) unregister_library(gLibId); - NXMutexFree(gLibLock); -} - - -int _NonAppCheckUnload( void ) -{ -/* This function cannot be the first in the file for if the file is linked - * first, then the check-unload function's offset will be nlmname.nlm+0 - * which is how to tell that there isn't one. When the check function is - * first in the linked objects, it is ambiguous. For this reason, we will - * put it inside this file after the stop function. - * - * Here we check to see if it's alright to ourselves to be unloaded. If not, - * we return a non-zero value. Right now, there isn't any reason not to allow - * it. - */ - return 0; -} |