]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
fix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD
authorRudolf Polzer <divverent@xonotic.org>
Wed, 2 Nov 2011 11:08:52 +0000 (12:08 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 2 Nov 2011 11:08:52 +0000 (12:08 +0100)
fs.c

diff --git a/fs.c b/fs.c
index 96bc76709416311ac6395a3a00858739e577f383..a49eadf7edbb3d4387cb61fc606f676daaa8fa0e 100644 (file)
--- 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