]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
lib/file: bad merge
authorVMware, Inc <>
Sat, 28 May 2011 19:50:42 +0000 (12:50 -0700)
committerMarcelo Vanzin <mvanzin@vmware.com>
Sat, 28 May 2011 19:50:42 +0000 (12:50 -0700)
I merge a change and dropped some code that needed to be there.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
open-vm-tools/lib/file/fileIOPosix.c

index 0e51dce571129fda6710d72e84086a6bc9039de5..e73a5f4770a0b5fa9ac4e129c69362aaa709ef83 100644 (file)
@@ -882,9 +882,11 @@ FileIOCreateRetry(FileIODescriptor *file,   // OUT:
    }
 #endif
 
+#if defined(O_NOFOLLOW)
    if (access & FILEIO_OPEN_ACCESS_NOFOLLOW) {
       flags |= O_NOFOLLOW;
    }
+#endif
 
    flags |= FileIO_OpenActions[action];