--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2021-12-15 16:12:54 UTC +++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/driver_utils.cpp @@ -17,7 +17,7 @@ # include #endif -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) # include #endif @@ -207,7 +207,7 @@ OSVersion GetMacOSVersion() } #endif -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) bool ParseLinuxOSVersion(const char *version, int *major, int *minor, int *patch) { errno = 0; // reset global error flag. @@ -219,6 +219,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj } *minor = static_cast(strtol(next + 1, &next, 10)); +#if defined(__FreeBSD__) + if (next == nullptr || *next != '-' || errno != 0) + { + return false; + } + + *patch = 0; +#else if (next == nullptr || *next != '.' || errno != 0) { return false; @@ -229,6 +237,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj { return false; } +#endif return true; } @@ -236,7 +245,7 @@ OSVersion GetLinuxOSVersion() OSVersion GetLinuxOSVersion() { -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) struct utsname uname_info; if (uname(&uname_info) != 0) {