Revert "Merge pull request #241"

This reverts commit f5edbe2, reversing
changes made to 6aaa45d.

Author: jmikola

src/BSON/UTCDateTime.c

@@ -55,7 +55,7 @@ PHP_METHOD(UTCDateTime, __construct)
 	long                      milliseconds;
 #if SIZEOF_LONG == 4
 	char                        *s_milliseconds;
-	int                          s_milliseconds_len;
+	int 	                     s_milliseconds_len;
 #endif
 
 

src/bson.c

@@ -41,6 +41,22 @@
 #include "php_phongo.h"
 #include "php_bson.h"
 
+
+#define BSON_APPEND_INT32(b,key,val) \
+	bson_append_int32 (b, key, (int) strlen (key), val)
+
+#if SIZEOF_LONG == 8
+#	define BSON_APPEND_INT(b, key, keylen, val) \
+	if (val > INT_MAX || val < INT_MIN) { \
+		bson_append_int64(b, key, keylen, val); \
+	} else { \
+		bson_append_int32(b, key, keylen, val); \
+	}
+#elif SIZEOF_LONG == 4
+#	define BSON_APPEND_INT(b, key, keylen, val) \
+	bson_append_int32(b, key, keylen, val);
+#endif
+
 #undef MONGOC_LOG_DOMAIN
 #define MONGOC_LOG_DOMAIN "PHONGO-BSON"
 
@@ -989,17 +1005,7 @@ static void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, cons
 #endif
 
 		case IS_LONG:
-#if SIZEOF_LONG == 8 || (PHP_VERSION_ID >= 70000 && SIZEOF_ZEND_LONG == 8)
-			if (val > INT_MAX || val < INT_MIN) {
-				bson_append_int64(bson, key, keylen, Z_LVAL_P(entry));
-			} else {
-				bson_append_int32(bson, key, keylen, Z_LVAL_P(entry));
-			}
-#elif SIZEOF_LONG == 4 || (PHP_VERSION_ID >= 70000 && SIZEOF_ZEND_LONG == 4)
-			bson_append_int32(bson, key, keylen, Z_LVAL_P(entry));
-#else
-#error Need fix for this architecture
-#endif
+			BSON_APPEND_INT(bson, key, key_len, Z_LVAL_P(entry));
 			break;
 
 		case IS_DOUBLE: