From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 2 Nov 2011 11:08:52 +0000 (+0100)
Subject: fix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD
X-Git-Tag: xonotic-v0.6.0~186
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c9cf1669fc885cecb6b7a82fd86b17df9b965486;p=xonotic%2Fdarkplaces.git

fix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD
---

diff --git a/fs.c b/fs.c
index 96bc7670..a49eadf7 100644
--- a/fs.c
+++ b/fs.c
@@ -1877,7 +1877,7 @@ int FS_ChooseUserDir(userdirmode_t userdirmode, char *userdir, size_t userdirsiz
 	// see if we can write to this path (note: won't create path)
 #ifdef WIN32
 	// no access() here, we must try to open the file for appending
-	fd = Sys_SysOpenFD(va("%s%s/config.cfg", userdir, gamedirname1), "a", false);
+	fd = FS_SysOpenFD(va("%s%s/config.cfg", userdir, gamedirname1), "a", false);
 	if(fd >= 0)
 		close(fd);
 #else