CVS update: php31/ext/standard
| From: | shane | Date: | Tue, 22 Sep 1998 19:19:45 +0000 |
| Subject: | CVS update: php31/ext/standard | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1415@lists.php.net to get a copy of this message | ||
Date: Tuesday September 22, 1998 @ 15:19
Author: shane
Update of /repository/php31/ext/standard
In directory asf:/u2/tmp/cvs-serv25775/ext/standard
Modified Files:
pageinfo.c pageinfo.h
Log Message:
Fix memory manager start/shutdown
remove NT specific code so we can run on 95/98 again
fix some compile warnings
Index: php31/ext/standard/pageinfo.c
diff -c php31/ext/standard/pageinfo.c:2.1 php31/ext/standard/pageinfo.c:2.2
*** php31/ext/standard/pageinfo.c:2.1 Sun Aug 30 02:45:19 1998
--- php31/ext/standard/pageinfo.c Tue Sep 22 15:19:44 1998
***************
*** 47,54 ****
#endif
#include <sys/stat.h>
#if (WIN32|WINNT)
! #include <process.h>
! #include "os/nt/fileaccess.h"
#endif
#ifndef THREAD_SAFE
--- 47,56 ----
#endif
#include <sys/stat.h>
#if (WIN32|WINNT)
! # include <process.h>
! # if USE_NT_SPECIFIC
! # include "os/nt/fileaccess.h"
! # endif
#endif
#ifndef THREAD_SAFE
***************
*** 62,68 ****
char *path;
struct stat sb;
! #if (WIN32|WINNT)
if (!GLOBAL(sapi_rqst)->page_uid) {
#else
if (GLOBAL(sapi_rqst)->page_uid == -1) {
--- 64,70 ----
char *path;
struct stat sb;
! #if (WIN32|WINNT) && USE_NT_SPECIFIC
if (!GLOBAL(sapi_rqst)->page_uid) {
#else
if (GLOBAL(sapi_rqst)->page_uid == -1) {
***************
*** 73,79 ****
php3_error(E_WARNING, "Unable to find file: '%s'", path);
return;
}
! #if (WIN32|WINNT)
GLOBAL(sapi_rqst)->page_uid = GetFileOwner(path);
#else
GLOBAL(sapi_rqst)->page_uid = sb.st_uid;
--- 75,81 ----
php3_error(E_WARNING, "Unable to find file: '%s'", path);
return;
}
! #if (WIN32|WINNT) && USE_NT_SPECIFIC
GLOBAL(sapi_rqst)->page_uid = GetFileOwner(path);
#else
GLOBAL(sapi_rqst)->page_uid = sb.st_uid;
***************
*** 84,90 ****
}
}
! #if (WIN32|WINNT)
PHPAPI PSID _php3_getuid(void)
#else
PHPAPI long _php3_getuid(void)
--- 86,92 ----
}
}
! #if (WIN32|WINNT) && USE_NT_SPECIFIC
PHPAPI PSID _php3_getuid(void)
#else
PHPAPI long _php3_getuid(void)
***************
*** 97,103 ****
void php3_getmyuid(INTERNAL_FUNCTION_PARAMETERS)
{
! #if WIN32|WINNT
PSID uid;
TCHAR TextualSid[512];
DWORD SidSize=512;
--- 99,105 ----
void php3_getmyuid(INTERNAL_FUNCTION_PARAMETERS)
{
! #if (WIN32|WINNT) && USE_NT_SPECIFIC
PSID uid;
TCHAR TextualSid[512];
DWORD SidSize=512;
***************
*** 106,112 ****
#endif
uid = _php3_getuid();
! #if (WIN32|WINNT)
GetTextualSid(uid,TextualSid,&SidSize);
if (!uid) {
RETURN_FALSE;
--- 108,114 ----
#endif
uid = _php3_getuid();
! #if (WIN32|WINNT) && USE_NT_SPECIFIC
GetTextualSid(uid,TextualSid,&SidSize);
if (!uid) {
RETURN_FALSE;
Index: php31/ext/standard/pageinfo.h
diff -c php31/ext/standard/pageinfo.h:2.1 php31/ext/standard/pageinfo.h:2.2
*** php31/ext/standard/pageinfo.h:2.1 Sun Aug 30 02:45:20 1998
--- php31/ext/standard/pageinfo.h Tue Sep 22 15:19:44 1998
***************
*** 6,12 ****
extern void php3_getmyinode(INTERNAL_FUNCTION_PARAMETERS);
extern void php3_getlastmod(INTERNAL_FUNCTION_PARAMETERS);
! #if (WIN32|WINNT)
extern PHPAPI PSID _php3_getuid(void);
#else
extern PHPAPI long _php3_getuid(void);
--- 6,12 ----
extern void php3_getmyinode(INTERNAL_FUNCTION_PARAMETERS);
extern void php3_getlastmod(INTERNAL_FUNCTION_PARAMETERS);
! #if (WIN32|WINNT) && USE_NT_SPECIFIC
extern PHPAPI PSID _php3_getuid(void);
#else
extern PHPAPI long _php3_getuid(void);
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net