diff options
Diffstat (limited to 'lib/common/BoxPlatform.h')
| -rw-r--r-- | lib/common/BoxPlatform.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/common/BoxPlatform.h b/lib/common/BoxPlatform.h index 617aa031..2c7ffcf6 100644 --- a/lib/common/BoxPlatform.h +++ b/lib/common/BoxPlatform.h @@ -23,7 +23,11 @@ #ifdef _MSC_VER #include "BoxConfig-MSVC.h" +<<<<<<< HEAD #include "BoxVersion.h" +======= +#define NEED_BOX_VERSION_H +>>>>>>> 0.12 #else #include "BoxConfig.h" #endif @@ -159,7 +163,19 @@ #define INFTIM -1 #endif +<<<<<<< HEAD // for Unix compatibility with Windows :-) +======= +// Define O_BINARY for Unix compatibility with Windows :-) +// MSVC 2010 and newer MinGW define this in fcntl.h, which is probably +// not included by this point, so include it now so that we can detect +// if we need O_BINARY + +#ifdef HAVE_FCNTL_H +# include <fcntl.h> +#endif + +>>>>>>> 0.12 #ifndef O_BINARY #define O_BINARY 0 #endif |