Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2eea850

Browse filesBrowse files
danielbayleymarco-ippolito
danielbayley
authored and
marco-ippolito
committed
src,test: further cleanup references to osx
PR-URL: #53820 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
1 parent e352a4e commit 2eea850
Copy full SHA for 2eea850

36 files changed

+48-48Lines changed: 48 additions & 48 deletions
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ else
10031003
BINARYNAME=$(TARNAME)-$(PLATFORM)-$(ARCH)
10041004
endif
10051005
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/
10071007
HAS_XZ ?= $(shell command -v xz > /dev/null 2>&1; [ $$? -eq 0 ] && echo 1 || echo 0)
10081008
# Supply SKIP_XZ=1 to explicitly skip .tar.xz creation
10091009
SKIP_XZ ?= 0
Collapse file

‎configure.py‎

Copy file name to clipboardExpand all lines: configure.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,14 @@
163163
dest="fully_static",
164164
default=None,
165165
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")
167167

168168
parser.add_argument("--partly-static",
169169
action="store_true",
170170
dest="partly_static",
171171
default=None,
172172
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")
174174

175175
parser.add_argument("--enable-vtune-profiling",
176176
action="store_true",
@@ -1682,7 +1682,7 @@ def without_ssl_error(option):
16821682
def configure_static(o):
16831683
if options.fully_static or options.partly_static:
16841684
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 "
16861686
"when using the default compilation environment")
16871687
return
16881688

Collapse file

‎node.gypi‎

Copy file name to clipboardExpand all lines: node.gypi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
}],
218218

219219
[ 'OS=="mac"', {
220-
# linking Corefoundation is needed since certain OSX debugging tools
220+
# linking Corefoundation is needed since certain macOS debugging tools
221221
# like Instruments require it for some features
222222
'libraries': [ '-framework CoreFoundation' ],
223223
'defines!': [
Collapse file

‎src/large_pages/node_large_page.cc‎

Copy file name to clipboardExpand all lines: src/large_pages/node_large_page.cc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
// To move the .text section, perform the following steps:
4949
// * Map a new, temporary area and copy the original code there.
5050
// * 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,
5252
// use mmap flags to request hugepages.
5353
// * On Linux use madvise with MADV_HUGEPAGE to use anonymous 2MB pages.
5454
// * If successful copy the code to the newly mapped area and protect it to
Collapse file

‎src/node_internals.h‎

Copy file name to clipboardExpand all lines: src/node_internals.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ bool HasSignalJSHandler(int signum);
363363

364364
#ifdef _WIN32
365365
typedef SYSTEMTIME TIME_TYPE;
366-
#else // UNIX, OSX
366+
#else // UNIX, macOS
367367
typedef struct tm TIME_TYPE;
368368
#endif
369369

Collapse file

‎src/node_report.cc‎

Copy file name to clipboardExpand all lines: src/node_report.cc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static void WriteNodeReport(Isolate* isolate,
133133
tm_struct.wMinute,
134134
tm_struct.wSecond);
135135
writer.json_keyvalue("dumpEventTime", timebuf);
136-
#else // UNIX, OSX
136+
#else // UNIX, macOS
137137
snprintf(timebuf,
138138
sizeof(timebuf),
139139
"%4d-%02d-%02dT%02d:%02d:%02dZ",
Collapse file

‎src/util.cc‎

Copy file name to clipboardExpand all lines: src/util.cc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ std::vector<char> ReadFileSync(FILE* fp) {
316316
void DiagnosticFilename::LocalTime(TIME_TYPE* tm_struct) {
317317
#ifdef _WIN32
318318
GetLocalTime(tm_struct);
319-
#else // UNIX, OSX
319+
#else // UNIX, macOS
320320
struct timeval time_val;
321321
gettimeofday(&time_val, nullptr);
322322
localtime_r(&time_val.tv_sec, tm_struct);
@@ -339,7 +339,7 @@ std::string DiagnosticFilename::MakeFilename(
339339
oss << "." << std::setfill('0') << std::setw(2) << tm_struct.wHour;
340340
oss << std::setfill('0') << std::setw(2) << tm_struct.wMinute;
341341
oss << std::setfill('0') << std::setw(2) << tm_struct.wSecond;
342-
#else // UNIX, OSX
342+
#else // UNIX, macOS
343343
oss << "."
344344
<< std::setfill('0')
345345
<< std::setw(4)
Collapse file

‎test/common/README.md‎

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 numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ Platform check for Linux.
282282

283283
Platform check for Linux on PowerPC.
284284

285-
### `isOSX`
285+
### `isMacOS`
286286

287287
* [\<boolean>][<boolean>]
288288

Collapse file

‎test/common/index.js‎

Copy file name to clipboardExpand all lines: test/common/index.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ const isSunOS = process.platform === 'sunos';
141141
const isFreeBSD = process.platform === 'freebsd';
142142
const isOpenBSD = process.platform === 'openbsd';
143143
const isLinux = process.platform === 'linux';
144-
const isOSX = process.platform === 'darwin';
144+
const isMacOS = process.platform === 'darwin';
145145
const isASan = process.config.variables.asan === 1;
146146
const isPi = (() => {
147147
try {
@@ -981,7 +981,7 @@ const common = {
981981
isLinux,
982982
isMainThread,
983983
isOpenBSD,
984-
isOSX,
984+
isMacOS,
985985
isPi,
986986
isSunOS,
987987
isWindows,
Collapse file

‎test/common/index.mjs‎

Copy file name to clipboardExpand all lines: test/common/index.mjs
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const {
3030
isLinuxPPCBE,
3131
isMainThread,
3232
isOpenBSD,
33-
isOSX,
33+
isMacOS,
3434
isSunOS,
3535
isWindows,
3636
localIPv6Hosts,
@@ -85,7 +85,7 @@ export {
8585
isLinuxPPCBE,
8686
isMainThread,
8787
isOpenBSD,
88-
isOSX,
88+
isMacOS,
8989
isSunOS,
9090
isWindows,
9191
localIPv6Hosts,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.