diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2013-09-04 15:12:37 +0000 |
| commit | 7844495624be79259e613182e6a615319b2f4376 (patch) | |
| tree | 8656b9339174ab9061b42be2b50c2d9563401c8a /otherlibs/win32unix/open.c | |
| parent | e9723139769a4df610fadba0fdeecab298c1c17e (diff) | |
Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/win32unix/open.c')
| -rw-r--r-- | otherlibs/win32unix/open.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/otherlibs/win32unix/open.c b/otherlibs/win32unix/open.c index a2ffa4e1e..afb8d0fb9 100644 --- a/otherlibs/win32unix/open.c +++ b/otherlibs/win32unix/open.c @@ -40,7 +40,8 @@ CAMLprim value unix_open(value path, value flags, value perm) HANDLE h; fileaccess = convert_flag_list(flags, open_access_flags); - sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE | convert_flag_list(flags, open_share_flags); + sharemode = FILE_SHARE_READ | FILE_SHARE_WRITE + | convert_flag_list(flags, open_share_flags); createflags = convert_flag_list(flags, open_create_flags); if ((createflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) |