Author: rhuijben
Date: Mon May 20 12:33:13 2013
New Revision: 1484445
URL: http://svn.apache.org/r1484445
Log:
Following up on r1484439, use the file control api instead of the generic io
control api. Somehow the sqlite implementation renames this to ioctl in its
platform abstraction layer for *nixes.
* subversion/libsvn_subr/io.c
(includes): Include fcntl.h instead of ioctl.h
(svn_io_file_flush_to_disk): Use fcntl to perform the sync.
Modified:
subversion/trunk/subversion/libsvn_subr/io.c
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1484445&r1=1484444&r2=1484445&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Mon May 20 12:33:13 2013
@@ -51,8 +51,8 @@
#include <arch/win32/apr_arch_file_io.h>
#endif
-#if APR_HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
+#if APR_HAVE_FCNTL_H
+#include <fcntl.h>
#endif
#include "svn_hash.h"
@@ -2118,7 +2118,7 @@ svn_error_t *svn_io_file_flush_to_disk(a
do {
#ifdef F_FULLFSYNC
- rv = ioctl(filehand, F_FULLFSYNC, 0);
+ rv = fcntl(filehand, F_FULLFSYNC, 0);
#else
rv = fsync(filehand);
#endif
