diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-06-22 08:39:35 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-06-22 08:39:35 +0400 |
| commit | aa267976b86f90423204e11a30eec4e0def0f296 (patch) | |
| tree | e1b09c017eef0191473b9aa1e59fd08ffe705f43 /source/blender/imbuf/intern/imbuf.h | |
| parent | f1fb09a493b79e6320a651a035203dff98c3b580 (diff) | |
| parent | 1efffc1f564af0597512699890d7be9f41a6aee2 (diff) | |
NLA SoC: Merge from 2.5
21043 to 21072
(NOTE TO SELF: Campbell made a commit in 2.5 before this merge finished)
Diffstat (limited to 'source/blender/imbuf/intern/imbuf.h')
| -rw-r--r-- | source/blender/imbuf/intern/imbuf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h index bd2a0d3082f..7b5d668ce2b 100644 --- a/source/blender/imbuf/intern/imbuf.h +++ b/source/blender/imbuf/intern/imbuf.h @@ -51,7 +51,7 @@ #include <sys/mman.h> #endif -#if !defined(WIN32) && !defined(__BeOS) +#if !defined(WIN32) #define O_BINARY 0 #endif |