diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-05 12:15:27 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-05 19:16:22 +0000 |
| commit | 357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch) | |
| tree | 58a77b4dc8e1192db6278716b320bf42a18ded8f /tools | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
A bunch of "{Mac} OS X" -> "macOS" changes.
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.
Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/checkAPIs.pl | 2 | ||||
| -rwxr-xr-x | tools/test-common.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/checkAPIs.pl b/tools/checkAPIs.pl index 7ea8a1d0d4..163347b423 100755 --- a/tools/checkAPIs.pl +++ b/tools/checkAPIs.pl @@ -1386,7 +1386,7 @@ sub checkAPIsCalledWithTvbGetPtr($$$) } } -# List of possible shadow variable (Majority coming from Mac OS X..) +# List of possible shadow variable (Majority coming from macOS..) my @ShadowVariable = ( 'index', 'time', diff --git a/tools/test-common.sh b/tools/test-common.sh index 74c955bfd3..22987a28e2 100755 --- a/tools/test-common.sh +++ b/tools/test-common.sh @@ -54,11 +54,11 @@ MAX_CPU_TIME=600 # Stop the child process if it's using more than y * 1024 bytes MAX_VMEM=1000000 # Stop the child process if its stack is larger than than z * 1024 bytes -# Windows XP: 2033 -# Windows 7: 2034 -# OS X 10.6: 8192 -# Linux 2.6.24: 8192 -# Solaris 10: 8192 +# Windows XP: 2033 +# Windows 7: 2034 +# Mac OS X 10.6: 8192 +# Linux 2.6.24: 8192 +# Solaris 10: 8192 MAX_STACK=2033 # Insert z times an error into the capture file (0.02 seems to be a good value to find errors) ERR_PROB=0.02 |