PHPC-183: Fix compiler warnings with -Wdeclaration-after-statement

bjori · bjori · commit b40a98e67721 · 2015-03-20T15:37:24.000-07:00
This also increases the chances of successful Windows build :)
diff --git a/php_phongo.c b/php_phongo.c
@@ -674,8 +674,8 @@ int phongo_stream_close(mongoc_stream_t *stream) /* {{{ */
 
 void php_phongo_set_timeout(php_phongo_stream_socket *base_stream, int32_t timeout_msec) /* {{{ */
 {
-	TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
 	struct timeval rtimeout = {0, 0};
+	TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
 
 	if (timeout_msec > 0) {
 		rtimeout.tv_sec = timeout_msec / 1000;
@@ -1665,9 +1665,11 @@ PHP_GINIT_FUNCTION(phongo)
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(phongo)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	void ***ctx = NULL;
 	TSRMLS_SET_CTX(ctx);
+	(void)type; /* We don't care if we are loaded via dl() or extension= */
+
+
 	REGISTER_INI_ENTRIES();
 
 	/* Initialize libbson */
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -141,8 +141,8 @@ zend_object_value php_phongo_binary_create_object(zend_class_entry *class_type T
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Binary)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "Binary", php_phongo_binary_me);
 	ce.create_object = php_phongo_binary_create_object;
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -129,8 +129,9 @@ zend_object_value php_phongo_javascript_create_object(zend_class_entry *class_ty
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Javascript)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
+
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "Javascript", php_phongo_javascript_me);
 	ce.create_object = php_phongo_javascript_create_object;
diff --git a/src/BSON/MaxKey.c b/src/BSON/MaxKey.c
@@ -87,8 +87,9 @@ zend_object_value php_phongo_maxkey_create_object(zend_class_entry *class_type T
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(MaxKey)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
+
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "MaxKey", php_phongo_maxkey_me);
 	ce.create_object = php_phongo_maxkey_create_object;
diff --git a/src/BSON/MinKey.c b/src/BSON/MinKey.c
@@ -87,8 +87,9 @@ zend_object_value php_phongo_minkey_create_object(zend_class_entry *class_type T
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(MinKey)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
+
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "MinKey", php_phongo_minkey_me);
 	ce.create_object = php_phongo_minkey_create_object;
diff --git a/src/BSON/ObjectID.c b/src/BSON/ObjectID.c
@@ -180,8 +180,8 @@ HashTable *php_phongo_objectid_get_debug_info(zval *object, int *is_temp TSRMLS_
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(ObjectID)
 {
-	(void)type;(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "ObjectID", php_phongo_objectid_me);
 	php_phongo_objectid_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/BSON/Persistable.c b/src/BSON/Persistable.c
@@ -60,9 +60,8 @@ static zend_function_entry php_phongo_persistable_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Persistable)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "Persistable", php_phongo_persistable_me);
 	php_phongo_persistable_ce = zend_register_internal_interface(&ce TSRMLS_CC);
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -194,8 +194,8 @@ zend_object_value php_phongo_regex_create_object(zend_class_entry *class_type TS
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Regex)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "Regex", php_phongo_regex_me);
 	ce.create_object = php_phongo_regex_create_object;
diff --git a/src/BSON/Serializable.c b/src/BSON/Serializable.c
@@ -64,9 +64,8 @@ static zend_function_entry php_phongo_serializable_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Serializable)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "Serializable", php_phongo_serializable_me);
 	php_phongo_serializable_ce = zend_register_internal_interface(&ce TSRMLS_CC);
diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -138,8 +138,8 @@ zend_object_value php_phongo_timestamp_create_object(zend_class_entry *class_typ
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Timestamp)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "Timestamp", php_phongo_timestamp_me);
 	ce.create_object = php_phongo_timestamp_create_object;
diff --git a/src/BSON/Type.c b/src/BSON/Type.c
@@ -60,8 +60,8 @@ static zend_function_entry php_phongo_type_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Type)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "Type", php_phongo_type_me);
 	php_phongo_type_ce = zend_register_internal_interface(&ce TSRMLS_CC);
diff --git a/src/BSON/UTCDatetime.c b/src/BSON/UTCDatetime.c
@@ -154,8 +154,8 @@ zend_object_value php_phongo_utcdatetime_create_object(zend_class_entry *class_t
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(UTCDatetime)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "UTCDatetime", php_phongo_utcdatetime_me);
 	ce.create_object = php_phongo_utcdatetime_create_object;
diff --git a/src/BSON/Unserializable.c b/src/BSON/Unserializable.c
@@ -65,9 +65,8 @@ static zend_function_entry php_phongo_unserializable_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Unserializable)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "BSON", "Unserializable", php_phongo_unserializable_me);
 	php_phongo_unserializable_ce = zend_register_internal_interface(&ce TSRMLS_CC);
diff --git a/src/MongoDB/AuthenticationException.c b/src/MongoDB/AuthenticationException.c
@@ -57,9 +57,8 @@ static zend_function_entry php_phongo_authenticationexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(AuthenticationException)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "AuthenticationException", php_phongo_authenticationexception_me);
 	php_phongo_authenticationexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/BulkWrite.c b/src/MongoDB/BulkWrite.c
@@ -334,8 +334,8 @@ HashTable *php_phongo_bulkwrite_get_debug_info(zval *object, int *is_temp TSRMLS
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(BulkWrite)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "BulkWrite", php_phongo_bulkwrite_me);
 	php_phongo_bulkwrite_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/BulkWriteException.c b/src/MongoDB/BulkWriteException.c
@@ -57,8 +57,8 @@ static zend_function_entry php_phongo_bulkwriteexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(BulkWriteException)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "BulkWriteException", php_phongo_bulkwriteexception_me);
 	php_phongo_bulkwriteexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/Command.c b/src/MongoDB/Command.c
@@ -150,8 +150,8 @@ HashTable *php_phongo_command_get_debug_info(zval *object, int *is_temp TSRMLS_D
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Command)
 {
-	(void)type;(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Command", php_phongo_command_me);
 	php_phongo_command_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/ConnectionException.c b/src/MongoDB/ConnectionException.c
@@ -57,9 +57,8 @@ static zend_function_entry php_phongo_connectionexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(ConnectionException)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ConnectionException", php_phongo_connectionexception_me);
 	php_phongo_connectionexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/ConnectionTimeoutException.c b/src/MongoDB/ConnectionTimeoutException.c
@@ -57,9 +57,8 @@ static zend_function_entry php_phongo_connectiontimeoutexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(ConnectionTimeoutException)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ConnectionTimeoutException", php_phongo_connectiontimeoutexception_me);
 	php_phongo_connectiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/Cursor.c b/src/MongoDB/Cursor.c
@@ -437,8 +437,8 @@ HashTable *php_phongo_cursor_get_debug_info(zval *object, int *is_temp TSRMLS_DC
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Cursor)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Cursor", php_phongo_cursor_me);
 	php_phongo_cursor_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/CursorId.c b/src/MongoDB/CursorId.c
@@ -158,8 +158,8 @@ HashTable *php_phongo_cursorid_get_debug_info(zval *object, int *is_temp TSRMLS_
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(CursorId)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "CursorId", php_phongo_cursorid_me);
 	php_phongo_cursorid_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/DuplicateKeyException.c b/src/MongoDB/DuplicateKeyException.c
@@ -57,9 +57,8 @@ static zend_function_entry php_phongo_duplicatekeyexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(DuplicateKeyException)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "DuplicateKeyException", php_phongo_duplicatekeyexception_me);
 	php_phongo_duplicatekeyexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/Exception.c b/src/MongoDB/Exception.c
@@ -57,9 +57,8 @@ static zend_function_entry php_phongo_exception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Exception)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Exception", php_phongo_exception_me);
 	php_phongo_exception_ce = zend_register_internal_interface(&ce TSRMLS_CC);
diff --git a/src/MongoDB/ExecutionTimeoutException.c b/src/MongoDB/ExecutionTimeoutException.c
@@ -57,9 +57,8 @@ static zend_function_entry php_phongo_executiontimeoutexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(ExecutionTimeoutException)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ExecutionTimeoutException", php_phongo_executiontimeoutexception_me);
 	php_phongo_executiontimeoutexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/InvalidArgumentException.c b/src/MongoDB/InvalidArgumentException.c
@@ -57,8 +57,8 @@ static zend_function_entry php_phongo_invalidargumentexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(InvalidArgumentException)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "InvalidArgumentException", php_phongo_invalidargumentexception_me);
 	php_phongo_invalidargumentexception_ce = zend_register_internal_class_ex(&ce, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -529,8 +529,8 @@ HashTable *php_phongo_manager_get_debug_info(zval *object, int *is_temp TSRMLS_D
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Manager)
 {
-	(void)type;(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Manager", php_phongo_manager_me);
 	php_phongo_manager_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/Query.c b/src/MongoDB/Query.c
@@ -166,7 +166,7 @@ HashTable *php_phongo_query_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
 PHP_MINIT_FUNCTION(Query)
 {
 	zend_class_entry ce;
-	(void)type; (void)module_number;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Query", php_phongo_query_me);
 	php_phongo_query_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -161,8 +161,8 @@ HashTable *php_phongo_readpreference_get_debug_info(zval *object, int *is_temp T
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(ReadPreference)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ReadPreference", php_phongo_readpreference_me);
 	php_phongo_readpreference_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/Result.c b/src/MongoDB/Result.c
@@ -281,8 +281,8 @@ HashTable *php_phongo_result_get_debug_info(zval *object, int *is_temp TSRMLS_DC
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Result)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Result", php_phongo_result_me);
 	php_phongo_result_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/RuntimeException.c b/src/MongoDB/RuntimeException.c
@@ -57,9 +57,8 @@ static zend_function_entry php_phongo_runtimeexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(RuntimeException)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "RuntimeException", php_phongo_runtimeexception_me);
 	php_phongo_runtimeexception_ce = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException, NULL TSRMLS_CC);
diff --git a/src/MongoDB/SSLConnectionException.c b/src/MongoDB/SSLConnectionException.c
@@ -57,9 +57,8 @@ static zend_function_entry php_phongo_sslconnectionexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(SSLConnectionException)
 {
-	(void)type;
-	(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "SSLConnectionException", php_phongo_sslconnectionexception_me);
 	php_phongo_sslconnectionexception_ce = zend_register_internal_class_ex(&ce, php_phongo_connectionexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/Server.c b/src/MongoDB/Server.c
@@ -514,8 +514,8 @@ zend_object_value php_phongo_server_create_object(zend_class_entry *class_type T
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(Server)
 {
-	(void)type;(void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Server", php_phongo_server_me);
 	php_phongo_server_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -170,8 +170,8 @@ HashTable *php_phongo_writeconcern_get_debug_info(zval *object, int *is_temp TSR
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(WriteConcern)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteConcern", php_phongo_writeconcern_me);
 	php_phongo_writeconcern_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/WriteConcernError.c b/src/MongoDB/WriteConcernError.c
@@ -183,8 +183,8 @@ HashTable *php_phongo_writeconcernerror_get_debug_info(zval *object, int *is_tem
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(WriteConcernError)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteConcernError", php_phongo_writeconcernerror_me);
 	php_phongo_writeconcernerror_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/WriteConcernException.c b/src/MongoDB/WriteConcernException.c
@@ -57,8 +57,8 @@ static zend_function_entry php_phongo_writeconcernexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(WriteConcernException)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteConcernException", php_phongo_writeconcernexception_me);
 	php_phongo_writeconcernexception_ce = zend_register_internal_class_ex(&ce, php_phongo_writeexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/WriteError.c b/src/MongoDB/WriteError.c
@@ -202,8 +202,8 @@ HashTable *php_phongo_writeerror_get_debug_info(zval *object, int *is_temp TSRML
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(WriteError)
 {
-	(void)type; (void)module_number;
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteError", php_phongo_writeerror_me);
 	php_phongo_writeerror_ce = zend_register_internal_class(&ce TSRMLS_CC);
diff --git a/src/MongoDB/WriteException.c b/src/MongoDB/WriteException.c
@@ -84,8 +84,8 @@ static zend_function_entry php_phongo_writeexception_me[] = {
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(WriteException)
 {
-	(void)type; /* We don't care if we are loaded via dl() or extension= */
 	zend_class_entry ce;
+	(void)type;(void)module_number;
 
 	INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteException", php_phongo_writeexception_me);
 	php_phongo_writeexception_ce = zend_register_internal_class_ex(&ce, php_phongo_runtimeexception_ce, NULL TSRMLS_CC);
diff --git a/src/MongoDB/WriteResult.c b/src/MongoDB/WriteResult.c
diff --git a/src/bson.c b/src/bson.c

Original file line number	Diff line number	Diff line change
`@@ -141,8 +141,8 @@ zend_object_value php_phongo_binary_create_object(zend_class_entry *class_type T`
`141`	`141`	`/* {{{ PHP_MINIT_FUNCTION */`
`142`	`142`	`PHP_MINIT_FUNCTION(Binary)`
`143`	`143`	`{`
`144`		`- (void)type; /* We don't care if we are loaded via dl() or extension= */`
`145`	`144`	`zend_class_entry ce;`
	`145`	`+ (void)type;(void)module_number;`
`146`	`146`
`147`	`147`	`INIT_NS_CLASS_ENTRY(ce, "BSON", "Binary", php_phongo_binary_me);`
`148`	`148`	`ce.create_object = php_phongo_binary_create_object;`
Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ HashTable php_phongo_objectid_get_debug_info(zval object, int *is_temp TSRMLS_`
`180`	`180`	`/* {{{ PHP_MINIT_FUNCTION */`
`181`	`181`	`PHP_MINIT_FUNCTION(ObjectID)`
`182`	`182`	`{`
`183`		`- (void)type;(void)module_number;`
`184`	`183`	`zend_class_entry ce;`
	`184`	`+ (void)type;(void)module_number;`
`185`	`185`
`186`	`186`	`INIT_NS_CLASS_ENTRY(ce, "BSON", "ObjectID", php_phongo_objectid_me);`
`187`	`187`	`php_phongo_objectid_ce = zend_register_internal_class(&ce TSRMLS_CC);`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ zend_object_value php_phongo_regex_create_object(zend_class_entry *class_type TS`
`194`	`194`	`/* {{{ PHP_MINIT_FUNCTION */`
`195`	`195`	`PHP_MINIT_FUNCTION(Regex)`
`196`	`196`	`{`
`197`		`- (void)type; /* We don't care if we are loaded via dl() or extension= */`
`198`	`197`	`zend_class_entry ce;`
	`198`	`+ (void)type;(void)module_number;`
`199`	`199`
`200`	`200`	`INIT_NS_CLASS_ENTRY(ce, "BSON", "Regex", php_phongo_regex_me);`
`201`	`201`	`ce.create_object = php_phongo_regex_create_object;`
Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,8 @@ zend_object_value php_phongo_timestamp_create_object(zend_class_entry *class_typ`
`138`	`138`	`/* {{{ PHP_MINIT_FUNCTION */`
`139`	`139`	`PHP_MINIT_FUNCTION(Timestamp)`
`140`	`140`	`{`
`141`		`- (void)type; /* We don't care if we are loaded via dl() or extension= */`
`142`	`141`	`zend_class_entry ce;`
	`142`	`+ (void)type;(void)module_number;`
`143`	`143`
`144`	`144`	`INIT_NS_CLASS_ENTRY(ce, "BSON", "Timestamp", php_phongo_timestamp_me);`
`145`	`145`	`ce.create_object = php_phongo_timestamp_create_object;`