mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-20 18:53:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

We do not need to check the return value of php_win32_init_gettimeofday() anymore, as the symbol is always going to be available to us

Browse Source
This commit is contained in:
Kalle Sommer Nielsen 2016-08-11 04:35:51 +02:00
parent 0baab6c051
commit 13e076f446
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
win32/dllmain.c
View File

@ -40,11 +40,19 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID dummy)
switch (reason)
{
case DLL_PROCESS_ATTACH:
ret = ret && php_win32_init_gettimeofday();
if (!ret) {
fprintf(stderr, "gettimeofday() initialization failed");
return ret;
}
/*
* We do not need to check the return value of php_win32_init_gettimeofday()
* because the symbol bare minimum symbol we need is always available on our
* lowest supported platform.
*
* On Windows 8 or greater, we use a more precise symbol to obtain the system
* time, which is dynamically. The fallback allows us to proper support
* Vista/7/Server 2003 R2/Server 2008/Server 2008 R2.
*
* Instead simply initialize the global in win32/time.c for gettimeofday()
* use later on
*/
php_win32_init_gettimeofday();
ret = ret && php_win32_ioutil_init();
if (!ret) {

4
win32/time.c
View File

@ -51,11 +51,9 @@ static zend_always_inline MyGetSystemTimeAsFileTime get_time_func(void)
return timefunc;
}
BOOL php_win32_init_gettimeofday(void)
void php_win32_init_gettimeofday(void)
{
timefunc = get_time_func();
return (NULL != timefunc);
}
#endif

2
win32/time.h
View File

@ -55,7 +55,7 @@ PHPAPI int usleep(unsigned int useconds);
#ifdef PHP_EXPORTS
/* This symbols are needed only for the DllMain, but should not be exported
or be available when used with PHP binaries. */
BOOL php_win32_init_gettimeofday(void);
void php_win32_init_gettimeofday(void);
#endif
#endif