Merge branch 'master' into x86_64

2012-07-21 14:17:22 +01:00
parent 5234e66d32 e6e6f56ccf
commit 5f6b522746
32 changed files with 1121 additions and 612 deletions
@@ -89,7 +89,7 @@ remove_dir_contents(Path& path, bool force, bool removeAttributes)
 {
 	// open the dir
 	DIR* dir = opendir(path.GetPath());
-	if (dir < 0) {
+	if (dir == NULL) {
 		fprintf(stderr, "Error: Failed to open dir \"%s\": %s\n",
 			path.GetPath(), strerror(errno));
 		return;