Title: [240038] trunk/Source/WTF
- Revision
- 240038
- Author
- [email protected]
- Date
- 2019-01-16 08:32:36 -0800 (Wed, 16 Jan 2019)
Log Message
[WTF] Compilation fails with system malloc
https://bugs.webkit.org/show_bug.cgi?id=172445
Reviewed by Michael Catanzaro.
Follow-up to r217270. The sysinfo() system call is specific to
Linux so update the #ifdef checks accordingly.
* wtf/RAMSize.cpp:
(WTF::computeRAMSize):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (240037 => 240038)
--- trunk/Source/WTF/ChangeLog 2019-01-16 16:03:31 UTC (rev 240037)
+++ trunk/Source/WTF/ChangeLog 2019-01-16 16:32:36 UTC (rev 240038)
@@ -1,3 +1,16 @@
+2019-01-16 Alberto Garcia <[email protected]>
+
+ [WTF] Compilation fails with system malloc
+ https://bugs.webkit.org/show_bug.cgi?id=172445
+
+ Reviewed by Michael Catanzaro.
+
+ Follow-up to r217270. The sysinfo() system call is specific to
+ Linux so update the #ifdef checks accordingly.
+
+ * wtf/RAMSize.cpp:
+ (WTF::computeRAMSize):
+
2019-01-15 Chris Dumez <[email protected]>
Unreviewed, revert part of r239997 as it is not needed to fix the build.
Modified: trunk/Source/WTF/wtf/RAMSize.cpp (240037 => 240038)
--- trunk/Source/WTF/wtf/RAMSize.cpp 2019-01-16 16:03:31 UTC (rev 240037)
+++ trunk/Source/WTF/wtf/RAMSize.cpp 2019-01-16 16:32:36 UTC (rev 240038)
@@ -32,9 +32,9 @@
#if OS(WINDOWS)
#include <windows.h>
#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
-#if OS(UNIX)
+#if OS(LINUX)
#include <sys/sysinfo.h>
-#endif // OS(UNIX)
+#endif // OS(LINUX)
#else
#include <bmalloc/bmalloc.h>
#endif
@@ -55,13 +55,13 @@
return ramSizeGuess;
return status.ullTotalPhys;
#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
-#if OS(UNIX)
+#if OS(LINUX)
struct sysinfo si;
sysinfo(&si);
return si.totalram * si.mem_unit;
#else
#error "Missing a platform specific way of determining the available RAM"
-#endif // OS(UNIX)
+#endif // OS(LINUX)
#else
return bmalloc::api::availableMemory();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
