From 2527948d197fbcb99bd19d3bbb7ec85440598060 Mon Sep 17 00:00:00 2001 From: Jose Antonio Ortega Ruiz Date: Thu, 3 Nov 2011 23:12:56 +0100 Subject: Compilation errors in OpenBSD fixed Hat tip Ivo van der Sangen. --- NEWS | 1 + src/StatFS.hsc | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 05a98f7..4d7a15b 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,7 @@ _Bug fixes_ - Fix for pulseaudio problems in volume monitor (Martin Perner). - Fix for parsing errors when a `Run` entry ended in an array (Martin). + - Fixed compilation in OpenBSD (Ivo van der Sangen). [issue 48]: http://code.google.com/p/xmobar/issues/detail?id=48 [issue 50]: http://code.google.com/p/xmobar/issues/detail?id=50 diff --git a/src/StatFS.hsc b/src/StatFS.hsc index 391da68..871beb5 100644 --- a/src/StatFS.hsc +++ b/src/StatFS.hsc @@ -23,7 +23,11 @@ import Foreign.C.String import Data.ByteString (useAsCString) import Data.ByteString.Char8 (pack) -#if defined (__FreeBSD__) || defined (__APPLE__) +#if defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__APPLE__) +#define IS_BSD_SYSTEM +#endif + +#ifdef IS_BSD_SYSTEM # include # include #else @@ -47,7 +51,7 @@ data FileSystemStats = FileSystemStats { data CStatfs -#if defined (__FreeBSD__) || defined (__APPLE__) +#ifdef IS_BSD_SYSTEM foreign import ccall unsafe "sys/mount.h statfs" #else foreign import ccall unsafe "sys/vfs.h statfs64" -- cgit v1.2.3