Merge pull request kartverket#18 from tibnor/master

Made macro to replace vfs.h with mount.h for Mac
petterreinholdtsen · Jan 3, 2015 · 5b9437e · 5b9437e
2 parents 4d075ad + 4d406a3
commit 5b9437e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/UT/DISKINFO.cpp b/src/UT/DISKINFO.cpp
@@ -17,7 +17,11 @@
 #     include <sys/statvfs.h>
 #  else
 #     include <sys/stat.h>
-#     include <sys/vfs.h>
+#     ifdef __APPLE__
+#        include<sys/mount.h>
+#     else
+#        include<sys/vfs.h>
+#     endif
 #  endif
 
 #  include <sys/types.h>

diff --git a/src/UT/INQSIZE.cpp b/src/UT/INQSIZE.cpp
@@ -16,7 +16,11 @@
 #  include<stdio.h>
 #  include<sys/time.h>
 #  include<sys/types.h>
-#  include<sys/vfs.h>
+#  ifdef __APPLE__
+#     include<sys/mount.h>
+#  else
+#     include<sys/vfs.h>
+#  endif
 #  include<fcntl.h>
 #  include<sys/stat.h>
 #  include<errno.h>

diff --git a/src/UT/INQTID.cpp b/src/UT/INQTID.cpp
@@ -15,7 +15,11 @@
 #  include<stdio.h>
 #  include<sys/time.h>
 #  include<sys/types.h>
-#  include<sys/vfs.h>
+#  ifdef __APPLE__
+#    include<sys/mount.h>
+#  else
+#    include<sys/vfs.h>
+#  endif
 #  include<fcntl.h>
 #  include<sys/stat.h>
 #  include<errno.h>