diff options
| author | Kent Mein <mein@cs.umn.edu> | 2003-01-30 21:51:05 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2003-01-30 21:51:05 +0300 |
| commit | 9475bf9e29cfab4c9d831ec3e52d2b3985ff5290 (patch) | |
| tree | 6af3e18c842ffeb7455238d467f7da03c0c7f739 /source | |
| parent | 96cb7d1629648d238542afe332138c0b02bd6597 (diff) | |
Modified checks for defined __FreeBSD__ to also include defined (__OpenBSD__)
From: http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=840
Kent
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenlib/intern/storage.c | 4 | ||||
| -rw-r--r-- | source/blender/bpython/intern/api.h | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/imbuf.h | 6 | ||||
| -rw-r--r-- | source/blender/readstreamglue/BLO_sys_types.h | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 58b5607ded5..2d67f4766f1 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -60,7 +60,7 @@ #include <sys/statfs.h> #endif -#ifdef __FreeBSD__ +#ifdef defined (__FreeBSD__) || defined (__OpenBSD__) #include <sys/param.h> #include <sys/mount.h> #endif @@ -194,7 +194,7 @@ double BLI_diskfree(char *dir) if (slash) slash[1] = 0; } else strcpy(name,"/"); -#if defined __FreeBSD__ || defined linux +#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) if (statfs(name, &disk)) return(-1); #endif #ifdef __BeOS diff --git a/source/blender/bpython/intern/api.h b/source/blender/bpython/intern/api.h index f73f43af0d3..70f89abb2e6 100644 --- a/source/blender/bpython/intern/api.h +++ b/source/blender/bpython/intern/api.h @@ -72,7 +72,7 @@ MODNAME(BLENDERMODULE) -> "_Blender" // module configuration -- TODO: this should be set later from the Makefile... /* commented out by mein@cs.umn.edu default is non static now :) -#if defined(__FreeBSD__) || defined(__linux__) || defined (__sgi) || defined(__sparc) || defined(__sparc__) +#if defined(__FreeBSD__) || defined(__linux__) || defined (__sgi) || defined(__sparc) || defined(__sparc__) || defined (__OpenBSD__) #define STATIC_TEXTTOOLS 1 #endif */ diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index 63679be7f31..1a9334cf714 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -50,12 +50,6 @@ #include <string.h> #include <math.h> -#if !defined(__FreeBSD__) && !defined(__APPLE__) - -/* #include <malloc.h> */ /* _should_ be in stdlib */ - -#endif - #ifndef WIN32 #include <sys/mman.h> #endif diff --git a/source/blender/readstreamglue/BLO_sys_types.h b/source/blender/readstreamglue/BLO_sys_types.h index 4ae5eca51da..4333f74465d 100644 --- a/source/blender/readstreamglue/BLO_sys_types.h +++ b/source/blender/readstreamglue/BLO_sys_types.h @@ -81,7 +81,7 @@ typedef unsigned __int64 uint64_t; #ifdef _WIN32 #define htonl(x) correctByteOrder(x) #define ntohl(x) correctByteOrder(x) -#elif defined __FreeBSD__ +#elif defined (__FreeBSD__) || defined (__OpenBSD__) #include <sys/param.h> #elif defined (__APPLE__) #include <sys/types.h> |