Merge branch 'fix-win-compile-1.5.6' into v1.5

derickr · derickr · commit 336f8f6dfb84 · 2014-09-16T12:37:51.000+01:00
diff --git a/mcon/manager.c b/mcon/manager.c
@@ -142,7 +142,7 @@ static mongo_connection *mongo_get_connection_single(mongo_con_manager *manager,
 	return con;
 }
 
-static inline int mongo_strings_equal_or_null(const char *s1, const char *s2)
+static int mongo_strings_equal_or_null(const char *s1, const char *s2)
 {
 	return (
 		(s1 == NULL && s2 == NULL) ||

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ static mongo_connection mongo_get_connection_single(mongo_con_manager manager,`
`142`	`142`	`return con;`
`143`	`143`	`}`
`144`	`144`
`145`		`-static inline int mongo_strings_equal_or_null(const char s1, const char s2)`
	`145`	`+static int mongo_strings_equal_or_null(const char s1, const char s2)`
`146`	`146`	`{`
`147`	`147`	`return (`
`148`	`148`	`(s1 == NULL && s2 == NULL) \|\|`