1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00

Automatically check for the fdatasync() function and replace it with fsync()

if not found. (CVS 2739)

FossilOrigin-Name: 385a08afefaf552db221ae8bd30ecc7e7c07ee5b
This commit is contained in:
drh
2005-10-04 18:38:49 +00:00
parent 762e584e2c
commit af6edf5534
4 changed files with 122 additions and 10 deletions

107
configure vendored
View File

@@ -1496,7 +1496,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# The following RCS revision string applies to configure.in
# $Revision: 1.31 $
# $Revision: 1.32 $
#########
# Programs needed
@@ -20340,6 +20340,111 @@ if test $ac_cv_func_usleep = yes; then
fi
#--------------------------------------------------------------------
# Redefine fdatasync as fsync on systems that lack fdatasync
#--------------------------------------------------------------------
echo "$as_me:$LINENO: checking for fdatasync" >&5
echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6
if test "${ac_cv_func_fdatasync+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define fdatasync to an innocuous variant, in case <limits.h> declares fdatasync.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define fdatasync innocuous_fdatasync
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char fdatasync (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef fdatasync
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char fdatasync ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_fdatasync) || defined (__stub___fdatasync)
choke me
#else
char (*f) () = fdatasync;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != fdatasync;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_fdatasync=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_fdatasync=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5
echo "${ECHO_T}$ac_cv_func_fdatasync" >&6
if test $ac_cv_func_fdatasync = yes; then
:
else
cat >>confdefs.h <<\_ACEOF
#define fdatasync fsync
_ACEOF
fi
#########
# Generate the output files.
#

View File

@@ -116,7 +116,7 @@ AC_INIT(src/sqlite.h.in)
dnl Put the RCS revision string after AC_INIT so that it will also
dnl show in in configure.
# The following RCS revision string applies to configure.in
# $Revision: 1.17 $
# $Revision: 1.18 $
#########
# Programs needed
@@ -607,6 +607,13 @@ AC_SUBST(TARGET_DEBUG)
#
AC_CHECK_FUNC(usleep, [TARGET_CFLAGS="$TARGET_CFLAGS -DHAVE_USLEEP=1"])
#--------------------------------------------------------------------
# Redefine fdatasync as fsync on systems that lack fdatasync
#--------------------------------------------------------------------
AC_CHECK_FUNC(fdatasync, , AC_DEFINE(fdatasync, fsync))
#########
# Generate the output files.
#

View File

@@ -1,5 +1,5 @@
C The\shash\stables\sdeallocate\swhen\sempty\sin\sorder\sto\savoid\snuisanse\scomplaints\nfrom\svalgrind.\s\sAdded\stests\sto\sverify\sno\shash\stable\smemory\sleaks\sin\sos_unix.c.\s(CVS\s2738)
D 2005-10-03T15:11:09
C Automatically\scheck\sfor\sthe\sfdatasync()\sfunction\sand\sreplace\sit\swith\sfsync()\nif\snot\sfound.\s(CVS\s2739)
D 2005-10-04T18:38:50
F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -11,8 +11,8 @@ F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
F config.guess 2103e94b15dc57112d7b9ee152c6fac5288895b4
F config.sub 9bf686ec001ae7bc53f5b3563c90c62d4c6d48be
F configure b36e5d4156002b857e4c741626a7ac8412c2885c x
F configure.ac fe941d9e98fff7edecdaca36a730da76f397f378
F configure b03b598fb77785964f40a8095e41cf0ea36f5ccd x
F configure.ac e326bf833811b30229c996a0086c4ce563be7caa
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -314,7 +314,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 6d780ca6cfbea10d29a4a1b5226efb269606e21a
R 4faa63c8a1983f974ea848d286400f71
P 080eadca582a49a069a76ed113ec15e9bce2955a
R 3ecbcfe5901c6c8a7b3f81a3f1da8baf
U drh
Z 91a5e6855088b35f854c80b36fa5d6c9
Z a7dbf64f356a2c1f918f1d5112d2dd39

View File

@@ -1 +1 @@
080eadca582a49a069a76ed113ec15e9bce2955a
385a08afefaf552db221ae8bd30ecc7e7c07ee5b