Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
55b74483
Commit
55b74483
authored
Feb 06, 2006
by
Robert Millan
Committed by
Alexandre Julliard
Feb 06, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: For sys/mount.h, sys/statfs.h and sys/vfs.h, always include
them if present.
parent
c19b470f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
113 additions
and
450 deletions
+113
-450
configure
configure
+84
-333
configure.ac
configure.ac
+7
-79
file.c
dlls/ntdll/file.c
+7
-9
config.h.in
include/config.h.in
+0
-9
fstatvfs.c
libs/port/fstatvfs.c
+7
-9
statvfs.c
libs/port/statvfs.c
+7
-9
winapi_check
tools/winapi/winapi_check
+1
-2
No files found.
configure
View file @
55b74483
...
...
@@ -16202,231 +16202,6 @@ _ACEOF
fi
if
test
"
$ac_cv_header_sys_vfs_h
"
=
"yes"
then
echo
"
$as_me
:
$LINENO
: checking whether sys/vfs.h defines statfs"
>
&5
echo
$ECHO_N
"checking whether sys/vfs.h defines statfs...
$ECHO_C
"
>
&6
if
test
"
${
wine_cv_sys_vfs_has_statfs
+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. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <sys/vfs.h>
int
main ()
{
struct statfs stfs;
memset(&stfs,0,sizeof(stfs));
;
return 0;
}
_ACEOF
rm
-f
conftest.
$ac_objext
if
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_compile
\"
"
)
>
&5
(
eval
$ac_compile
)
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_objext'
{
(
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
wine_cv_sys_vfs_has_statfs
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
wine_cv_sys_vfs_has_statfs
=
no
fi
rm
-f
conftest.err conftest.
$ac_objext
conftest.
$ac_ext
fi
echo
"
$as_me
:
$LINENO
: result:
$wine_cv_sys_vfs_has_statfs
"
>
&5
echo
"
${
ECHO_T
}
$wine_cv_sys_vfs_has_statfs
"
>
&6
if
test
"
$wine_cv_sys_vfs_has_statfs
"
=
"yes"
then
cat
>>
confdefs.h
<<
\
_ACEOF
#define STATFS_DEFINED_BY_SYS_VFS 1
_ACEOF
fi
fi
if
test
"
$ac_cv_header_sys_statfs_h
"
=
"yes"
then
echo
"
$as_me
:
$LINENO
: checking whether sys/statfs.h defines statfs"
>
&5
echo
$ECHO_N
"checking whether sys/statfs.h defines statfs...
$ECHO_C
"
>
&6
if
test
"
${
wine_cv_sys_statfs_has_statfs
+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. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <sys/statfs.h>
int
main ()
{
struct statfs stfs;
;
return 0;
}
_ACEOF
rm
-f
conftest.
$ac_objext
if
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_compile
\"
"
)
>
&5
(
eval
$ac_compile
)
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_objext'
{
(
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
wine_cv_sys_statfs_has_statfs
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
wine_cv_sys_statfs_has_statfs
=
no
fi
rm
-f
conftest.err conftest.
$ac_objext
conftest.
$ac_ext
fi
echo
"
$as_me
:
$LINENO
: result:
$wine_cv_sys_statfs_has_statfs
"
>
&5
echo
"
${
ECHO_T
}
$wine_cv_sys_statfs_has_statfs
"
>
&6
if
test
"
$wine_cv_sys_statfs_has_statfs
"
=
"yes"
then
cat
>>
confdefs.h
<<
\
_ACEOF
#define STATFS_DEFINED_BY_SYS_STATFS 1
_ACEOF
fi
fi
if
test
"
$ac_cv_header_sys_mount_h
"
=
"yes"
then
echo
"
$as_me
:
$LINENO
: checking whether sys/mount.h defines statfs"
>
&5
echo
$ECHO_N
"checking whether sys/mount.h defines statfs...
$ECHO_C
"
>
&6
if
test
"
${
wine_cv_sys_mount_has_statfs
+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. */
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <sys/mount.h>
int
main ()
{
struct statfs stfs;
;
return 0;
}
_ACEOF
rm
-f
conftest.
$ac_objext
if
{
(
eval echo
"
$as_me
:
$LINENO
:
\"
$ac_compile
\"
"
)
>
&5
(
eval
$ac_compile
)
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_objext'
{
(
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
wine_cv_sys_mount_has_statfs
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
wine_cv_sys_mount_has_statfs
=
no
fi
rm
-f
conftest.err conftest.
$ac_objext
conftest.
$ac_ext
fi
echo
"
$as_me
:
$LINENO
: result:
$wine_cv_sys_mount_has_statfs
"
>
&5
echo
"
${
ECHO_T
}
$wine_cv_sys_mount_has_statfs
"
>
&6
if
test
"
$wine_cv_sys_mount_has_statfs
"
=
"yes"
then
cat
>>
confdefs.h
<<
\
_ACEOF
#define STATFS_DEFINED_BY_SYS_MOUNT 1
_ACEOF
fi
fi
echo
"
$as_me
:
$LINENO
: checking for struct statfs.f_bfree"
>
&5
echo
$ECHO_N
"checking for struct statfs.f_bfree...
$ECHO_C
"
>
&6
if
test
"
${
ac_cv_member_struct_statfs_f_bfree
+set
}
"
=
set
;
then
...
...
@@ -16442,16 +16217,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -16500,16 +16273,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -16579,16 +16350,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -16637,16 +16406,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -16716,16 +16483,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -16774,16 +16539,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -16853,16 +16616,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -16911,16 +16672,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -16990,16 +16749,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -17048,16 +16805,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -17127,16 +16882,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
@@ -17185,16 +16938,14 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
...
...
configure.ac
View file @
55b74483
...
...
@@ -1312,76 +1312,6 @@ then
fi
fi
dnl **** statfs checks ****
if test "$ac_cv_header_sys_vfs_h" = "yes"
then
AC_CACHE_CHECK( [whether sys/vfs.h defines statfs],
wine_cv_sys_vfs_has_statfs,
AC_TRY_COMPILE([
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <sys/vfs.h>
],[
struct statfs stfs;
memset(&stfs,0,sizeof(stfs));
],wine_cv_sys_vfs_has_statfs=yes,wine_cv_sys_vfs_has_statfs=no
)
)
if test "$wine_cv_sys_vfs_has_statfs" = "yes"
then
AC_DEFINE(STATFS_DEFINED_BY_SYS_VFS, 1,
[Define if the struct statfs is defined by <sys/vfs.h>])
fi
fi
if test "$ac_cv_header_sys_statfs_h" = "yes"
then
AC_CACHE_CHECK( [whether sys/statfs.h defines statfs],
wine_cv_sys_statfs_has_statfs,
AC_TRY_COMPILE([
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <sys/statfs.h>
],[
struct statfs stfs;
],wine_cv_sys_statfs_has_statfs=yes,wine_cv_sys_statfs_has_statfs=no
)
)
if test "$wine_cv_sys_statfs_has_statfs" = "yes"
then
AC_DEFINE(STATFS_DEFINED_BY_SYS_STATFS, 1,
[Define if the struct statfs is defined by <sys/statfs.h>])
fi
fi
if test "$ac_cv_header_sys_mount_h" = "yes"
then
AC_CACHE_CHECK( [whether sys/mount.h defines statfs],
wine_cv_sys_mount_has_statfs,
AC_TRY_COMPILE([
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#include <sys/mount.h>
],[
struct statfs stfs;
],wine_cv_sys_mount_has_statfs=yes,wine_cv_sys_mount_has_statfs=no
)
)
if test "$wine_cv_sys_mount_has_statfs" = "yes"
then
AC_DEFINE(STATFS_DEFINED_BY_SYS_MOUNT, 1,
[Define if the struct statfs is defined by <sys/mount.h>])
fi
fi
dnl **** FIXME: what about mixed cases, where we need two of them? ***
dnl Check for statfs members
...
...
@@ -1390,16 +1320,14 @@ AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_MOUNT
#ifdef
HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_VFS
# include <sys/vfs.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_VFS_H
# include <sys/vfs.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif])
AC_CHECK_MEMBERS([struct statvfs.f_blocks],,,
...
...
dlls/ntdll/file.c
View file @
55b74483
...
...
@@ -45,16 +45,14 @@
#ifdef HAVE_UTIME_H
# include <utime.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_VFS
#ifdef
HAVE_SYS_VFS_H
# include <sys/vfs.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_MOUNT
# include <sys/mount.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
#ifdef HAVE_IOKIT_IOKITLIB_H
...
...
include/config.h.in
View file @
55b74483
...
...
@@ -968,15 +968,6 @@
/* Define to the soname of the libXrender library. */
#undef SONAME_LIBXRENDER
/* Define if the struct statfs is defined by <sys/mount.h> */
#undef STATFS_DEFINED_BY_SYS_MOUNT
/* Define if the struct statfs is defined by <sys/statfs.h> */
#undef STATFS_DEFINED_BY_SYS_STATFS
/* Define if the struct statfs is defined by <sys/vfs.h> */
#undef STATFS_DEFINED_BY_SYS_VFS
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
...
...
libs/port/fstatvfs.c
View file @
55b74483
...
...
@@ -29,16 +29,14 @@
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_VFS
#ifdef
HAVE_SYS_VFS_H
# include <sys/vfs.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_MOUNT
# include <sys/mount.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
fstatvfs
(
int
fd
,
struct
statvfs
*
buf
)
...
...
libs/port/statvfs.c
View file @
55b74483
...
...
@@ -29,16 +29,14 @@
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
#ifdef
STATFS_DEFINED_BY_SYS_VFS
#ifdef
HAVE_SYS_VFS_H
# include <sys/vfs.h>
#else
# ifdef STATFS_DEFINED_BY_SYS_MOUNT
# include <sys/mount.h>
# else
# ifdef STATFS_DEFINED_BY_SYS_STATFS
# include <sys/statfs.h>
# endif
# endif
#endif
#ifdef HAVE_SYS_MOUNT_H
# include <sys/mount.h>
#endif
#ifdef HAVE_SYS_STATFS_H
# include <sys/statfs.h>
#endif
int
statvfs
(
const
char
*
path
,
struct
statvfs
*
buf
)
...
...
tools/winapi/winapi_check
View file @
55b74483
...
...
@@ -581,8 +581,7 @@ foreach my $file (@c_files) {
}
elsif
(
$macro
=~
/^HAVE_(.*?)_H$/
)
{
my
$name
=
$1
;
if
(
$header
!~
/^alloca\.h$/
&&
$file_dir
!~
/tests$/
&&
!
$preprocessor
->
is_def
(
"STATFS_DEFINED_BY_$name"
))
$file_dir
!~
/tests$/
)
{
$output
->
write
(
"$file: #$directive $argument: is a conditional include, "
.
"but is not protected\n"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment