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/lockf.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/lockf.c')
-rw-r--r-- | otherlibs/win32unix/lockf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/otherlibs/win32unix/lockf.c b/otherlibs/win32unix/lockf.c index 3c9d135b7..6e6ca0ad6 100644 --- a/otherlibs/win32unix/lockf.c +++ b/otherlibs/win32unix/lockf.c @@ -62,7 +62,8 @@ CAMLprim value unix_lockf(value fd, value cmd, value span) version.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); if(GetVersionEx(&version) == 0) { - invalid_argument("lockf only supported on WIN32_NT platforms: could not determine current platform."); + invalid_argument("lockf only supported on WIN32_NT platforms:" + " could not determine current platform."); } if(version.dwPlatformId != VER_PLATFORM_WIN32_NT) { invalid_argument("lockf only supported on WIN32_NT platforms"); |