<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/7f9b84edc12cb418866080da4bb5bccb39c15010">https://github.com/macports/macports-legacy-support/commit/7f9b84edc12cb418866080da4bb5bccb39c15010</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7f9b84edc12cb418866080da4bb5bccb39c15010
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Tue Mar 19 06:54:04 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> misc: whitespace-only canonicalization.
</span>---
include/MacportsLegacySupport.h | 2 +-
include/pthread.h | 2 +-
include/pthread_impl.h | 2 +-
include/sys/fcntl.h | 6 ++---
include/sys/unistd.h | 4 ++--
include/time.h | 2 +-
src/atcalls.c | 10 ++++-----
src/fdopendir.c | 4 ++--
src/memmem.c | 12 +++++-----
src/posix_memalign_emulation.c | 14 ++++++------
src/strndup.c | 2 +-
src/strnlen.c | 2 +-
src/time.c | 4 ++--
test/test_arc4random.c | 8 +++----
test/test_pthread_rwlock_basic.c | 2 +-
test/test_time.cpp | 2 +-
tiger_only/bin/which | 48 ++++++++++++++++++++--------------------
17 files changed, 63 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/MacportsLegacySupport.h b/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d9f794..6397485 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/MacportsLegacySupport.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@
</span>
/* sysconf() wrap has bail-out macros in case we want to disable only function wrapping */
#define __ENABLE_MP_LEGACY_SUPPORT_SYSCONF_WRAP__ (!__DISABLE_MP_LEGACY_SUPPORT_FUNCTION_WRAPPING__ && !__DISABLE_MP_LEGACY_SUPPORT_SYSCONF_WRAP__ && __MP_LEGACY_SUPPORT_SYSCONF_WRAP__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* pthread_rwlock_initializer is not defined on Tiger */
#define __MP_LEGACY_SUPPORT_PTHREAD_RWLOCK__ (__APPLE__ && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/pthread.h b/include/pthread.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 26f80a1..f676d07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/pthread.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/pthread.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@
</span> /* Include the primary system pthread.h */
#include_next <pthread.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_PTHREAD_RWLOCK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MP_LEGACY_SUPPORT_PTHREAD_RWLOCK__
</span> /* PTHREAD_RWLOCK_INITIALIZER is not defined on Tiger */
#ifndef PTHREAD_RWLOCK_INITIALIZER
#define PTHREAD_RWLOCK_INITIALIZER {_PTHREAD_RWLOCK_SIG_init, {0}}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/pthread_impl.h b/include/pthread_impl.h
</span><span style='display:block; white-space:pre;color:#808080;'>index b244b0c..75a0442 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/pthread_impl.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/pthread_impl.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@
</span> /* Include the primary system pthread_impl.h */
#include_next <pthread_impl.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#if __MP_LEGACY_SUPPORT_PTHREAD_RWLOCK__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if __MP_LEGACY_SUPPORT_PTHREAD_RWLOCK__
</span> /* PTHREAD_RWLOCK_INITIALIZER is not defined on Tiger */
#ifndef _PTHREAD_RWLOCK_SIG_init
#define _PTHREAD_RWLOCK_SIG_init 0x2DA8B3B4
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/fcntl.h b/include/sys/fcntl.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 87911f0..8ed7f4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/fcntl.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/fcntl.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span>
/* replace missing O_CLOEXEC definition with 0, which works
* but does not replace the full function of that flag
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * this is the commonly done fix in MacPorts (see gtk3, for example)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * this is the commonly done fix in MacPorts (see gtk3, for example)
</span> * FIXME - this could use a proper fix, if possible
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +39,10 @@
</span> #if __MP_LEGACY_SUPPORT_ATCALLS__
#ifndef AT_FDCWD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define AT_FDCWD -2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define AT_FDCWD -2
</span> #endif
#ifndef AT_EACCESS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define AT_EACCESS 0x0010 /* Use effective ids in access check */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define AT_EACCESS 0x0010 /* Use effective ids in access check */
</span> #endif
#ifndef AT_SYMLINK_NOFOLLOW
#define AT_SYMLINK_NOFOLLOW 0x0020 /* Act on the symlink itself not the target */
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/sys/unistd.h b/include/sys/unistd.h
</span><span style='display:block; white-space:pre;color:#808080;'>index c997150..9c5e0db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/sys/unistd.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/sys/unistd.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ typedef __darwin_ssize_t ssize_t;
</span>
#ifndef _UID_T
#define _UID_T
<span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef __darwin_uid_t uid_t; /* user id */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+typedef __darwin_uid_t uid_t; /* user id */
</span> #endif
#ifndef _GID_T
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ extern "C" {
</span> extern int linkat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath, int flags);
extern int symlinkat(const char *oldpath, int newdirfd, const char *newpath);
extern int unlinkat(int dirfd, const char *pathname, int flags);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifdef __cplusplus
}
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/time.h b/include/time.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f569af..0da257a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/time.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/time.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ extern "C" {
</span>
extern int clock_gettime( clockid_t clk_id, struct timespec *ts );
extern int clock_getres ( clockid_t clk_id, struct timespec *ts );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifdef __cplusplus
}
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/atcalls.c b/src/atcalls.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 12c4e6d..ea85ff2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/atcalls.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/atcalls.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,14 +4,14 @@
</span> * Copyright (c) 2013-2015 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span> * This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
* compliance with the License. Please obtain a copy of the License at
* http://www.opensource.apple.com/apsl/ and read it before using this
* file.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span> * The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span> * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
* Please see the License for the specific language governing rights and
* limitations under the License.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span> * @APPLE_LICENSE_HEADER_END@
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@
</span>
/* <sys/unistd.h> */
int getattrlistat(int dirfd, const char *pathname, struct attrlist *a,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- void *buf, size_t size, unsigned long flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *buf, size_t size, unsigned long flags);
</span>
ssize_t readlinkat(int dirfd, const char *pathname, char *buf, size_t bufsiz);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ int symlinkat(const char *oldpath, int newdirfd, const char *newpath);
</span> int unlinkat(int dirfd, const char *pathname, int flags);
/* #include <sys/stat.h> */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> int fchmodat(int dirfd, const char *pathname, mode_t mode, int flags);
int fstatat(int dirfd, const char *pathname, struct stat *buf, int flags);
int mkdirat(int dirfd, const char *pathname, mode_t mode);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/fdopendir.c b/src/fdopendir.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ce6725..7accea3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/fdopendir.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/fdopendir.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ DIR *fdopendir(int dirfd) {
</span> DIR *dir;
struct stat st;
int oldCWD = -1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if (fstat(dirfd, &st) < 0)
return 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,7 @@ DIR *fdopendir(int dirfd) {
</span> return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (oldCWD != -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (oldCWD != -1)
</span> PROTECT_ERRNO(close(oldCWD));
return dir;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/memmem.c b/src/memmem.c
</span><span style='display:block; white-space:pre;color:#808080;'>index ec61bd1..592003c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/memmem.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/memmem.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,26 +46,26 @@ memmem(const void *l, size_t l_len, const void *s, size_t s_len)
</span> register char *cur, *last;
const char *cl = (const char *)l;
const char *cs = (const char *)s;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* we need something to compare */
if (l_len == 0 || s_len == 0)
return NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* "s" must be smaller or equal to "l" */
if (l_len < s_len)
return NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* special case where s_len == 1 */
if (s_len == 1)
return memchr(l, (int)*cs, l_len);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> /* the last position where its possible to find "s" in "l" */
last = (char *)cl + l_len - s_len;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> for (cur = (char *)cl; cur <= last; cur++)
if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0)
return cur;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> return NULL;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/posix_memalign_emulation.c b/src/posix_memalign_emulation.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f6ea84..ee15265 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/posix_memalign_emulation.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/posix_memalign_emulation.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,14 +2,14 @@
</span> * Copyright (c) 1999, 2006-2008 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span> * This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
* Version 2.0 (the 'License'). You may not use this file except in
* compliance with the License. Please obtain a copy of the License at
* http://www.opensource.apple.com/apsl/ and read it before using this
* file.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span> * The Original Code and all software distributed under the License are
* distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@
</span> * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
* Please see the License for the specific language governing rights and
* limitations under the License.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span> * @APPLE_LICENSE_HEADER_END@
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,10 +52,10 @@
</span> int posix_memalign(void** pp, size_t alignment, size_t bytes) {
/* if alignment is 0 or not a power of 2 return bad value */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (alignment < sizeof( void *) || // excludes 0 == alignment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return EINVAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (alignment < sizeof( void *) || // excludes 0 == alignment
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return EINVAL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
void* mem = 0;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/strndup.c b/src/strndup.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 984083e..08ac065 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/strndup.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/strndup.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ strndup (const char *old, size_t sz)
</span> {
size_t len = strnlen (old, sz);
char *t = malloc(len + 1);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if (t != NULL) {
memcpy (t, old, len);
t[len] = '\0';
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/strnlen.c b/src/strnlen.c
</span><span style='display:block; white-space:pre;color:#808080;'>index c83f6b8..f64352e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/strnlen.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/strnlen.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ strnlen (const char *s, size_t len)
</span> size_t i;
for(i = 0; i < len && s[i]; i++)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;
</span> return i;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/time.c b/src/time.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 0db8dd3..e18d602 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/time.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/time.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ int clock_getres ( clockid_t clk_id, struct timespec *ts )
</span> if ( ts )
{
if ( CLOCK_REALTIME == clk_id ||
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CLOCK_MONOTONIC == clk_id )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLOCK_MONOTONIC == clk_id )
</span> {
// return 1us precision
ts->tv_sec = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ int clock_getres ( clockid_t clk_id, struct timespec *ts )
</span> #include <mach/clock.h>
#include <mach/mach.h>
int clock_gettime( int clk_id, struct timespec *ts )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+{
</span> clock_serv_t cclock;
mach_timespec_t mts;
host_get_clock_service( mach_host_self(), clk_id, &cclock );
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_arc4random.c b/test/test_arc4random.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 262d1ea..c92bb66 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_arc4random.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/test/test_arc4random.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,21 +97,21 @@ int
</span> main()
{
int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> int fd = open("/dev/urandom", O_RDONLY);
int args[] = { 16, 32, 64, 256, 512 };
int nargs = 5;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> printf("size, arc4rand,\tsysrand,\tspeed-up\n");
for (i = 0; i < nargs; ++i) {
int z = args[i];
if (z <= 0) continue;
bench(fd, z, NITER);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> close(fd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> return 0;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_pthread_rwlock_basic.c b/test/test_pthread_rwlock_basic.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 3707459..4b37515 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_pthread_rwlock_basic.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/test/test_pthread_rwlock_basic.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +34,6 @@ main (void)
</span> pthread_rwlock_unlock(&myLock);
pthread_rwlock_destroy(&myLock);
printf("Success testing pthread_rwlock_init\n\n");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> return 0;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/test/test_time.cpp b/test/test_time.cpp
</span><span style='display:block; white-space:pre;color:#808080;'>index 142e40a..83b2186 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/test/test_time.cpp
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/test/test_time.cpp
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ inline void res( CLOCKID clk_id )
</span>
int main()
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> int c(0);
res(CLOCK_REALTIME);
while ( ++c < 10 )
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tiger_only/bin/which b/tiger_only/bin/which
</span><span style='display:block; white-space:pre;color:#808080;'>index e91cde1..8624a4f 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tiger_only/bin/which
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tiger_only/bin/which
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +15,8 @@
</span> # documentation and/or other materials provided with the distribution.
# 3. All advertising materials mentioning features or use of this software
# must display the following acknowledgement:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This product includes software developed by the University of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# California, Berkeley and its contributors.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This product includes software developed by the University of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# California, Berkeley and its contributors.
</span> # 4. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,41 +33,41 @@
</span> # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# @(#)which.csh 5.5 (Berkeley) 4/18/91
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# @(#)which.csh 5.5 (Berkeley) 4/18/91
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# which : tells you which program you get
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which : tells you which program you get
</span> #
set prompt = "% "
set noglob
foreach arg ( $argv )
set alius = `alias $arg`
switch ( $#alius )
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case 0 :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- breaksw
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 1 :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arg = $alius[1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- breaksw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 0 :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ breaksw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 1 :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set arg = $alius[1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ breaksw
</span> default :
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${arg}: " " aliased to $alius
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo ${arg}: " " aliased to $alius
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span> endsw
unset found
if ( $arg:h != $arg:t ) then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( -e $arg ) then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $arg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $arg not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( -e $arg ) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $arg not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span> else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach i ( $path )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( -x $i/$arg && ! -d $i/$arg ) then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $i/$arg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach i ( $path )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( -x $i/$arg && ! -d $i/$arg ) then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo $i/$arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ end
</span> endif
if ( ! $?found ) then
#MACPORTS_EDIT echo no $arg in $path
</pre><pre style='margin:0'>
</pre>