GeezerVison is showing github.com — src,test: further cleanup references to osx · nodejs/node@2eea850
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: Makefile +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -1003,7 +1003,7 @@ else | 1003 | 1003 | BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH) | 1004 | 1004 | endif | 1005 | 1005 | BINARYTAR=$(BINARYNAME).tar | 1006 | | -# OSX doesn't have xz installed by default, http://macpkg.sourceforge.net/ | | 1006 | +# macOS doesn't have xz installed by default, http://macpkg.sourceforge.net/ | 1007 | 1007 | HAS_XZ ?= $(shell command -v xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0) | 1008 | 1008 | # Supply SKIP_XZ=1 to explicitly skip .tar.xz creation | 1009 | 1009 | SKIP_XZ ?= 0 | |
Collapse file Copy file name to clipboardExpand all lines: configure.py +3-3Lines changed: 3 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 163 | 163 | dest="fully_static", | 164 | 164 | default=None, | 165 | 165 | help="Generate an executable without external dynamic libraries. This " | 166 | | - "will not work on OSX when using the default compilation environment") | | 166 | + "will not work on macOS when using the default compilation environment") | 167 | 167 |
| 168 | 168 | parser.add_argument("--partly-static", | 169 | 169 | action="store_true", | 170 | 170 | dest="partly_static", | 171 | 171 | default=None, | 172 | 172 | help="Generate an executable with libgcc and libstdc++ libraries. This " | 173 | | - "will not work on OSX when using the default compilation environment") | | 173 | + "will not work on macOS when using the default compilation environment") | 174 | 174 |
| 175 | 175 | parser.add_argument("--enable-vtune-profiling", | 176 | 176 | action="store_true", | @@ -1682,7 +1682,7 @@ def without_ssl_error(option): | 1682 | 1682 | def configure_static(o): | 1683 | 1683 | if options.fully_static or options.partly_static: | 1684 | 1684 | if flavor == 'mac': | 1685 | | - warn("Generation of static executable will not work on OSX " | | 1685 | + warn("Generation of static executable will not work on macOS " | 1686 | 1686 | "when using the default compilation environment") | 1687 | 1687 | return | 1688 | 1688 |
| |
Collapse file Copy file name to clipboardExpand all lines: node.gypi +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 217 | 217 | }], | 218 | 218 |
| 219 | 219 | [ 'OS=="mac"', { | 220 | | - # linking Corefoundation is needed since certain OSX debugging tools | | 220 | + # linking Corefoundation is needed since certain macOS debugging tools | 221 | 221 | # like Instruments require it for some features | 222 | 222 | 'libraries': [ '-framework CoreFoundation' ], | 223 | 223 | 'defines!': [ | |
Collapse file Copy file name to clipboardExpand all lines: src/large_pages/node_large_page.cc +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
| 48 | 48 | // To move the .text section, perform the following steps: | 49 | 49 | // * Map a new, temporary area and copy the original code there. | 50 | 50 | // * Use mmap using the start address with MAP_FIXED so we get exactly the | 51 | | -// same virtual address (except on OSX). On platforms other than Linux, | | 51 | +// same virtual address (except on macOS). On platforms other than Linux, | 52 | 52 | // use mmap flags to request hugepages. | 53 | 53 | // * On Linux use madvise with MADV_HUGEPAGE to use anonymous 2MB pages. | 54 | 54 | // * If successful copy the code to the newly mapped area and protect it to | |
Collapse file Copy file name to clipboardExpand all lines: src/node_internals.h +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -363,7 +363,7 @@ bool HasSignalJSHandler(int signum); | 363 | 363 |
| 364 | 364 | #ifdef _WIN32 | 365 | 365 | typedef SYSTEMTIME TIME_TYPE; | 366 | | -#else // UNIX, OSX | | 366 | +#else // UNIX, macOS | 367 | 367 | typedef struct tm TIME_TYPE; | 368 | 368 | #endif | 369 | 369 |
| |
Collapse file Copy file name to clipboardExpand all lines: src/node_report.cc +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -133,7 +133,7 @@ static void WriteNodeReport(Isolate* isolate, | 133 | 133 | tm_struct.wMinute, | 134 | 134 | tm_struct.wSecond); | 135 | 135 | writer.json_keyvalue("dumpEventTime", timebuf); | 136 | | -#else // UNIX, OSX | | 136 | +#else // UNIX, macOS | 137 | 137 | snprintf(timebuf, | 138 | 138 | sizeof(timebuf), | 139 | 139 | "%4d-%02d-%02dT%02d:%02d:%02dZ", | |
Collapse file Copy file name to clipboardExpand all lines: src/util.cc +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -316,7 +316,7 @@ std::vector<char> ReadFileSync(FILE* fp) { | 316 | 316 | void DiagnosticFilename::LocalTime(TIME_TYPE* tm_struct) { | 317 | 317 | #ifdef _WIN32 | 318 | 318 | GetLocalTime(tm_struct); | 319 | | -#else // UNIX, OSX | | 319 | +#else // UNIX, macOS | 320 | 320 | struct timeval time_val; | 321 | 321 | gettimeofday(&time_val, nullptr); | 322 | 322 | localtime_r(&time_val.tv_sec, tm_struct); | @@ -339,7 +339,7 @@ std::string DiagnosticFilename::MakeFilename( | 339 | 339 | oss << "." << std::setfill('0') << std::setw(2) << tm_struct.wHour; | 340 | 340 | oss << std::setfill('0') << std::setw(2) << tm_struct.wMinute; | 341 | 341 | oss << std::setfill('0') << std::setw(2) << tm_struct.wSecond; | 342 | | -#else // UNIX, OSX | | 342 | +#else // UNIX, macOS | 343 | 343 | oss << "." | 344 | 344 | << std::setfill('0') | 345 | 345 | << std::setw(4) | |
Collapse file Copy file name to clipboardExpand all lines: test/common/README.md +1-1Lines changed: 1 addition & 1 deletion - Display the source diff
- Display the rich diff
| Original file line number | Diff line number | Diff line change |
|---|
@@ -282,7 +282,7 @@ Platform check for Linux. | 282 | 282 |
| 283 | 283 | Platform check for Linux on PowerPC. | 284 | 284 |
| 285 | | -### `isOSX` | | 285 | +### `isMacOS` | 286 | 286 |
| 287 | 287 | * [\<boolean>][<boolean>] | 288 | 288 |
| |
Collapse file Copy file name to clipboardExpand all lines: test/common/index.js +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -141,7 +141,7 @@ const isSunOS = process.platform === 'sunos'; | 141 | 141 | const isFreeBSD = process.platform === 'freebsd'; | 142 | 142 | const isOpenBSD = process.platform === 'openbsd'; | 143 | 143 | const isLinux = process.platform === 'linux'; | 144 | | -const isOSX = process.platform === 'darwin'; | | 144 | +const isMacOS = process.platform === 'darwin'; | 145 | 145 | const isASan = process.config.variables.asan === 1; | 146 | 146 | const isPi = (() => { | 147 | 147 | try { | @@ -981,7 +981,7 @@ const common = { | 981 | 981 | isLinux, | 982 | 982 | isMainThread, | 983 | 983 | isOpenBSD, | 984 | | - isOSX, | | 984 | + isMacOS, | 985 | 985 | isPi, | 986 | 986 | isSunOS, | 987 | 987 | isWindows, | |
Collapse file Copy file name to clipboardExpand all lines: test/common/index.mjs +2-2Lines changed: 2 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -30,7 +30,7 @@ const { | 30 | 30 | isLinuxPPCBE, | 31 | 31 | isMainThread, | 32 | 32 | isOpenBSD, | 33 | | - isOSX, | | 33 | + isMacOS, | 34 | 34 | isSunOS, | 35 | 35 | isWindows, | 36 | 36 | localIPv6Hosts, | @@ -85,7 +85,7 @@ export { | 85 | 85 | isLinuxPPCBE, | 86 | 86 | isMainThread, | 87 | 87 | isOpenBSD, | 88 | | - isOSX, | | 88 | + isMacOS, | 89 | 89 | isSunOS, | 90 | 90 | isWindows, | 91 | 91 | localIPv6Hosts, | |
|