mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
Replace OS X and Mac OS with macOS
This commit is contained in:
@@ -64,7 +64,7 @@ v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
|
||||
dict.Set("total", mem_info.total);
|
||||
dict.Set("free", mem_info.free);
|
||||
|
||||
// NB: These return bogus values on OS X
|
||||
// NB: These return bogus values on macOS
|
||||
#if !defined(OS_MACOSX)
|
||||
dict.Set("swapTotal", mem_info.swap_total);
|
||||
dict.Set("swapFree", mem_info.swap_free);
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#undef DISALLOW_COPY_AND_ASSIGN
|
||||
#undef NO_RETURN
|
||||
#undef arraysize
|
||||
#undef debug_string // This is defined in OS X 10.9 SDK in AssertMacros.h.
|
||||
#undef debug_string // This is defined in macOS 10.9 SDK in AssertMacros.h.
|
||||
#include "vendor/node/src/env.h"
|
||||
#include "vendor/node/src/env-inl.h"
|
||||
#include "vendor/node/src/node.h"
|
||||
|
||||
@@ -66,7 +66,7 @@ const char kType[] = "type";
|
||||
// Disable auto-hiding cursor.
|
||||
const char kDisableAutoHideCursor[] = "disableAutoHideCursor";
|
||||
|
||||
// Use the OS X's standard window instead of the textured window.
|
||||
// Use the macOS's standard window instead of the textured window.
|
||||
const char kStandardWindow[] = "standardWindow";
|
||||
|
||||
// Default browser window background color.
|
||||
|
||||
Reference in New Issue
Block a user