Merge branch 'master' of git@github.com:mongodb/mongo

2009-04-15 15:16:38 -04:00
parent a233875fbb 643ceabc75
commit ebcd7f9157
7 changed files with 13 additions and 7 deletions
--- a/db/instance.cpp
+++ b/db/instance.cpp
@@ -665,7 +665,7 @@ namespace mongo {
        // should we be locked here?  we aren't. might be ok as-is.
        recCacheCloseAll();
        
-#if !defined(_WIN32) and !defined(__sunos__)
+#if !defined(_WIN32) && !defined(__sunos__)
        flock( lockFile, LOCK_UN );
 #endif