1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
--- third_party/angle/src/libANGLE/renderer/driver_utils.cpp.orig 2021-05-12 22:13:33 UTC
+++ third_party/angle/src/libANGLE/renderer/driver_utils.cpp
@@ -17,7 +17,7 @@
# include <sys/system_properties.h>
#endif
-#if defined(ANGLE_PLATFORM_LINUX)
+#if defined(ANGLE_PLATFORM_POSIX)
# include <sys/utsname.h>
#endif
@@ -230,7 +230,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.
@@ -242,6 +242,14 @@ bool ParseLinuxOSVersion(const char *version, int *maj
}
*minor = static_cast<int>(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;
@@ -252,6 +260,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj
{
return false;
}
+#endif
return true;
}
@@ -259,7 +268,7 @@ bool ParseLinuxOSVersion(const char *version, int *maj
OSVersion GetLinuxOSVersion()
{
-#if defined(ANGLE_PLATFORM_LINUX)
+#if defined(ANGLE_PLATFORM_POSIX)
struct utsname uname_info;
if (uname(&uname_info) != 0)
{
|
