mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 09:37:50 +08:00
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
|
diff --git a/libcfile/libcfile_file.c b/libcfile/libcfile_file.c
|
||
|
|
index 13eab02..690cc04 100644
|
||
|
|
--- a/libcfile/libcfile_file.c
|
||
|
|
+++ b/libcfile/libcfile_file.c
|
||
|
|
@@ -56,7 +56,7 @@
|
||
|
|
#elif defined( HAVE_CYGWIN_FS_H )
|
||
|
|
#include <cygwin/fs.h>
|
||
|
|
|
||
|
|
-#elif defined( HAVE_LINUX_FS_H )
|
||
|
|
+#elif defined( __linux__ ) && defined( HAVE_LINUX_FS_H )
|
||
|
|
/* Required for Linux platforms that use a sizeof( u64 )
|
||
|
|
* in linux/fs.h but have no typedef of it
|
||
|
|
*/
|
||
|
|
@@ -4603,6 +4603,11 @@ ssize_t libcfile_file_io_control_read_with_error_code(
|
||
|
|
#error Missing file IO control with data function
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+// Force disable on Darwin, it can be erroneously defined
|
||
|
|
+#if defined ( __APPLE__ )
|
||
|
|
+#undef HAVE_POSIX_FADVISE
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
/* On some versions of Linux the FADVISE definions seem to be missing from fcntl.h
|
||
|
|
*/
|
||
|
|
#if defined( HAVE_POSIX_FADVISE ) && !defined( WINAPI )
|
||
|
|
diff --git a/libqcow/libqcow_i18n.c b/libqcow/libqcow_i18n.c
|
||
|
|
index f8a3164..d09ec79 100644
|
||
|
|
--- a/libqcow/libqcow_i18n.c
|
||
|
|
+++ b/libqcow/libqcow_i18n.c
|
||
|
|
@@ -40,7 +40,7 @@ int libqcow_i18n_initialize(
|
||
|
|
|
||
|
|
if( libqcow_i18n_initialized == 0 )
|
||
|
|
{
|
||
|
|
-#if defined( HAVE_BINDTEXTDOMAIN )
|
||
|
|
+#if !defined( __APPLE__ ) && defined( HAVE_BINDTEXTDOMAIN )
|
||
|
|
if( bindtextdomain(
|
||
|
|
"libqcow",
|
||
|
|
LOCALEDIR ) == NULL )
|