Skip to content

Commit

Permalink
We do not need to check the return value of php_win32_init_gettimeofd…
Browse files Browse the repository at this point in the history
…ay() anymore, as the symbol is always going to be available to us
  • Loading branch information
KalleZ committed Aug 11, 2016
1 parent 0baab6c commit 13e076f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
18 changes: 13 additions & 5 deletions win32/dllmain.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 1 addition & 3 deletions win32/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion win32/time.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 13e076f

Please sign in to comment.