PHPC-544: Use phongo_long in UTCDateTime ctor

This ensures that we properly check for 64-bit support in PHP 7.

Additionally, we relocate variable declarations and consolidate the conditionals so that "milliseconds" is only declared when used.

Author: jmikola

src/BSON/UTCDateTime.c

@@ -52,30 +52,36 @@ PHP_METHOD(UTCDateTime, __construct)
 {
 	php_phongo_utcdatetime_t    *intern;
 	zend_error_handling       error_handling;
-	long                      milliseconds;
-#if SIZEOF_LONG == 4
-	char                        *s_milliseconds;
-	int 	                     s_milliseconds_len;
-#endif
 
 
 	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
 	intern = Z_UTCDATETIME_OBJ_P(getThis());
 
-#if SIZEOF_LONG == 4
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &s_milliseconds, &s_milliseconds_len) == FAILURE) {
-		zend_restore_error_handling(&error_handling TSRMLS_CC);
-		return;
-	}
+#if SIZEOF_PHONGO_LONG == 8
+	{
+		phongo_long milliseconds;
 
-	intern->milliseconds = STRTOLL(s_milliseconds);
-#else
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &milliseconds) == FAILURE) {
-		zend_restore_error_handling(&error_handling TSRMLS_CC);
-		return;
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &milliseconds) == FAILURE) {
+			zend_restore_error_handling(&error_handling TSRMLS_CC);
+			return;
+		}
+
+		intern->milliseconds = milliseconds;
 	}
+#elif SIZEOF_PHONGO_LONG == 4
+	{
+		char                *s_milliseconds;
+		phongo_zpp_char_len  s_milliseconds_len;
 
-	intern->milliseconds = milliseconds;
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &s_milliseconds, &s_milliseconds_len) == FAILURE) {
+			zend_restore_error_handling(&error_handling TSRMLS_CC);
+			return;
+		}
+
+		intern->milliseconds = STRTOLL(s_milliseconds);
+	}
+#else
+# error Unsupported architecture (integers are neither 32-bit nor 64-bit)
 #endif
 
 	zend_restore_error_handling(&error_handling TSRMLS_CC);