diff options
Diffstat (limited to 'lib/common/BoxPlatform.h')
| -rw-r--r-- | lib/common/BoxPlatform.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/lib/common/BoxPlatform.h b/lib/common/BoxPlatform.h index 2c7ffcf6..53a967e8 100644 --- a/lib/common/BoxPlatform.h +++ b/lib/common/BoxPlatform.h @@ -23,11 +23,7 @@ #ifdef _MSC_VER #include "BoxConfig-MSVC.h" -<<<<<<< HEAD -#include "BoxVersion.h" -======= #define NEED_BOX_VERSION_H ->>>>>>> 0.12 #else #include "BoxConfig.h" #endif @@ -163,9 +159,6 @@ #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 @@ -175,7 +168,6 @@ # include <fcntl.h> #endif ->>>>>>> 0.12 #ifndef O_BINARY #define O_BINARY 0 #endif |