MFH: the #ifdef was never working. If Sun extends its NSAPI to support subrequests, much of this code must be rewritten. Because of that it is better to have a clean start. This commit does not change behaviour.

This commit is contained in:
Uwe Schindler 2009-01-06 13:46:20 +00:00
parent 9e831698f6
commit 3d4c47e2e5

View file

@ -238,13 +238,6 @@ char *nsapi_dll = NULL;
*/ */
static void php_nsapi_init_dynamic_symbols(void) static void php_nsapi_init_dynamic_symbols(void)
{ {
#if defined(servact_uri2path) && defined(servact_pathchecks) && defined(servact_fileinfo) && defined(servact_service)
/* use functions from nsapi.h if available */
nsapi_servact_uri2path = &servact_uri2path;
nsapi_servact_pathchecks = &servact_pathchecks;
nsapi_servact_fileinfo = &servact_fileinfo;
nsapi_servact_service = &servact_service;
#else
/* find address of internal NSAPI functions */ /* find address of internal NSAPI functions */
#ifdef PHP_WIN32 #ifdef PHP_WIN32
register int i; register int i;
@ -278,7 +271,6 @@ static void php_nsapi_init_dynamic_symbols(void)
nsapi_servact_fileinfo = NULL; nsapi_servact_fileinfo = NULL;
nsapi_servact_service = NULL; nsapi_servact_service = NULL;
} }
#endif
} }
/* }}} */ /* }}} */