diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-27 01:39:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-27 01:39:16 +0400 |
commit | f63e33303f3523420e6e20cd024dfe2cc649edca (patch) | |
tree | b77b6b2cc393478c2d72079fd40879c4ac3a6e82 /source/blender/blenlib/intern | |
parent | 2cd5436a81da5c15ac70bd2b80c2f062cce5d02e (diff) | |
parent | 8cc96408df7f3848ce7b7d3598c0caeb327e4f8c (diff) |
svn merge ^/trunk/blender -r42871:42882
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 001b191155d..c5b6f46b3bc 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -54,7 +54,7 @@ #include <sys/mount.h> #endif -#if defined(linux) || defined(__CYGWIN32__) || defined(__hpux) +#if defined(linux) || defined(__CYGWIN32__) || defined(__hpux) || defined(__GNU__) || defined(__GLIBC__) #include <sys/vfs.h> #endif @@ -180,7 +180,7 @@ double BLI_dir_free_space(const char *dir) if (slash) slash[1] = 0; } else strcpy(name,"/"); -#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || defined (__APPLE__) +#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || defined (__APPLE__) || defined(__GNU__) || defined(__GLIBC__) if (statfs(name, &disk)) return(-1); #endif |