Skip to content

Commit

Permalink
MacOS to macOS (#3259)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Walker authored Oct 15, 2020
1 parent 094aa32 commit 00c0160
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ sudo apt-get install git gcc g++ python pkg-config libssl-dev libdbus-1-dev libg

#### How to install prerequisites on macOS

On MacOS, first install Xcode from the Mac App Store. The remaining dependencies
On macOS, first install Xcode from the Mac App Store. The remaining dependencies
can be installed and satisfied using [Brew](https://brew.sh/):

```
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ Some tools and utilities are dependent on third party tools, such as Docker.
environments that don't pollute the host OS. It is also much easier to maintain
stability across multiple host environments. Install stable version of
[Docker Desktop](https://www.docker.com/products/docker-desktop) relevant to
your native OS (MacOS or Windows). Once installed, you can run docker commands
your native OS (macOS or Windows). Once installed, you can run docker commands
from the shell/terminal.
2 changes: 1 addition & 1 deletion docs/VSCODE_DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ workflow [here](https://code.visualstudio.com/docs/remote/containers).

Tested on:

- MacOS 10.5
- macOS 10.5
- Windows 10 Pro + WSL + Ubuntu 18 LTS

## Setup Steps
Expand Down
2 changes: 1 addition & 1 deletion src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The CHIP src directory is structured as follows:
| ble | BLE Layer -- Bluetooth Transport Protocol (BTP) |
| controller | Controller API |
| crypto | Cryptography libraries |
| darwin | Darwin Framework (iOS and MacOS) |
| darwin | Darwin Framework (iOS and macOS) |
| include | Public headers |
| inet | Network Layer -- TCP and UDP endpoints |
| lib | Core and Support libraries |
Expand Down
2 changes: 1 addition & 1 deletion src/inet/RawEndPoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#endif // HAVE_NETINET_ICMP6_H
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS

// SOCK_CLOEXEC not defined on all platforms, e.g. iOS/MacOS:
// SOCK_CLOEXEC not defined on all platforms, e.g. iOS/macOS:
#ifdef SOCK_CLOEXEC
#define SOCK_FLAGS SOCK_CLOEXEC
#else
Expand Down
6 changes: 3 additions & 3 deletions src/inet/TCPEndPoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include <stdio.h>
#include <string.h>

// SOCK_CLOEXEC not defined on all platforms, e.g. iOS/MacOS:
// SOCK_CLOEXEC not defined on all platforms, e.g. iOS/macOS:
#ifdef SOCK_CLOEXEC
#define SOCK_FLAGS SOCK_CLOEXEC
#else
Expand All @@ -74,15 +74,15 @@
// socket option level for Linux and BSD systems.
#define TCP_SOCKOPT_LEVEL SOL_TCP
#else
// socket option level for MacOS & iOS systems.
// socket option level for macOS & iOS systems.
#define TCP_SOCKOPT_LEVEL IPPROTO_TCP
#endif

#if defined(TCP_KEEPIDLE)
// socket option for Linux and BSD systems.
#define TCP_IDLE_INTERVAL_OPT_NAME TCP_KEEPIDLE
#else
// socket option for MacOS & iOS systems.
// socket option for macOS & iOS systems.
#define TCP_IDLE_INTERVAL_OPT_NAME TCP_KEEPALIVE
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/inet/UDPEndPoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

#include <string.h>

// SOCK_CLOEXEC not defined on all platforms, e.g. iOS/MacOS:
// SOCK_CLOEXEC not defined on all platforms, e.g. iOS/macOS:
#ifdef SOCK_CLOEXEC
#define SOCK_FLAGS SOCK_CLOEXEC
#else
Expand Down

0 comments on commit 00c0160

Please sign in to comment.