Showing the changes to codec/decoder/core/src/utils.cpp (1 of 14 files). Show all
Unified · Split
| @@ -46,6 +46,9 @@ · 45 unmodified lines | |||
| 46 | #include <windows.h> | 46 | #include <windows.h> |
| 47 | #include <sys/types.h> | 47 | #include <sys/types.h> |
| 48 | #include <sys/timeb.h> | 48 | #include <sys/timeb.h> |
| 49 | #ifndef _MSC_VER | ||
| 50 | #include <sys/time.h> | ||
| 51 | #endif | ||
| 49 | #else | 52 | #else |
| 50 | #include <sys/time.h> | 53 | #include <sys/time.h> |
| 51 | #include <sys/timeb.h> | 54 | #include <sys/timeb.h> |
| @@ -79,7 +82,7 @@ void_t WelsLog (void_t* pPtr, int32_t iLevel, const char* kpFmt, ...) { · 27 unmodified lines | |||
| 79 | } | 82 | } |
| 80 | 83 | ||
| 81 | 84 | ||
| 82 | #if defined(_WIN32) | 85 | #if defined(_WIN32) && defined(_MSC_VER) |
| 83 | 86 | ||
| 84 | #if defined(_MSC_VER) && (_MSC_VER>=1500) | 87 | #if defined(_MSC_VER) && (_MSC_VER>=1500) |
| 85 | 88 | ||
| @@ -275,4 +278,4 @@ int32_t WelsFflush (WelsFileHandle* pFp) { · 189 unmodified lines | |||
| 275 | return fflush (pFp); | 278 | return fflush (pFp); |
| 276 | } | 279 | } |
| 277 | 280 | ||
| 278 | } // namespace WelsDec | 281 | } // namespace WelsDec |