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

3 files changed, 15 insertions, 9 deletions

diff --git a/win32/dllmain.c b/win32/dllmain.c
index 37408f1e76..ab4f105528 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 dcc0943ec4..a0ed1b344e 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 b46c1675ca..865e299aa9 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