blob: 4e3061c22050ded7c4fd9ec652bc97b89a252908 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
diff --git a/libcfile/libcfile_file.c b/libcfile/libcfile_file.c
index a618083..5299c77 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
*/
@@ -4128,6 +4128,11 @@ ssize_t libcfile_internal_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
+
/* Read data from a device file using IO control
* Returns the number of bytes read if successful or -1 on error
*/
diff --git a/libqcow/libqcow_i18n.c b/libqcow/libqcow_i18n.c
index 96d1a31..621e748 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 )
|
