com php-src: We do not need to check the return value of php_win32_init_gettimeofday() anymore, as the symbol is always going to be available t o us:
win32/dllmain.c win32/time.c win3 2/time.h
| From: | Kalle Sommer Nielsen | Date: | Thu, 11 Aug 2016 02:35:51 +0000 |
| Subject: | com php-src: We do not need to check the return value of php_win32_init_gettimeofday() anymore, as the symbol is always going to be available t o us: win32/dllmain.c win32/time.c win3 2/time.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93737@lists.php.net to get a copy of this message | ||
Commit: 13e076f446b0997033b0f5dc886ee874c137775b
Author: Kalle Sommer Nielsen <kalle@php.net> Thu, 11 Aug 2016 04:35:51 +0200
Parents: 0baab6c051eef33573cd6dd798b747637d1ff127
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=13e076f446b0997033b0f5dc886ee874c137775b
Log:
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
Changed paths:
M win32/dllmain.c
M win32/time.c
M win32/time.h
Diff:
diff --git a/win32/dllmain.c b/win32/dllmain.c
index 37408f1..ab4f105 100644
--- a/win32/dllmain..c
+++ b/win32/dllmain.c
@@ -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) {
diff --git a/win32/time.c b/win32/time.c
index dcc0943..a0ed1b3 100644
--- a/win32/time.c
+++ b/win32/time.c
@@ -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
diff --git a/win32/time.h b/win32/time.h
index b46c167..865e299 100644
--- a/win32/time.h
+++ b/win32/time.h
@@ -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