diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-04 18:20:51 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-07-04 18:20:51 +0000 |
commit | 604de560099cb57534a90d4ff451f9ab3f221ee7 (patch) | |
tree | 0beadb9e98b532835bc11cb684a018d61141c630 | |
parent | 92ea0eadbe247a6b5c1893ae2a94358cca3be994 (diff) |
- (bal) glob.c defines TILDE and AIX also defines it. #undef it first.
bug #265
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/glob.c | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20020704 | 1 | 20020704 |
2 | - (bal) Limit data to TTY for AIX only (Newer versions can't handle the | 2 | - (bal) Limit data to TTY for AIX only (Newer versions can't handle the |
3 | faster data rate) Bug #124 | 3 | faster data rate) Bug #124 |
4 | - (bal) glob.c defines TILDE and AIX also defines it. #undef it first. | ||
5 | bug #265 | ||
4 | 6 | ||
5 | 20020703 | 7 | 20020703 |
6 | - (bal) Updated contrib/cygwin/ patch by vinschen@redhat.com | 8 | - (bal) Updated contrib/cygwin/ patch by vinschen@redhat.com |
@@ -1271,4 +1273,4 @@ | |||
1271 | - (stevesk) entropy.c: typo in debug message | 1273 | - (stevesk) entropy.c: typo in debug message |
1272 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1274 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1273 | 1275 | ||
1274 | $Id: ChangeLog,v 1.2333 2002/07/04 18:11:09 mouring Exp $ | 1276 | $Id: ChangeLog,v 1.2334 2002/07/04 18:20:51 mouring Exp $ |
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 365d4334f..14c91420d 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -97,6 +97,7 @@ static char rcsid[] = "$OpenBSD: glob.c,v 1.16 2001/04/05 18:36:12 deraadt Exp $ | |||
97 | #define RBRACKET ']' | 97 | #define RBRACKET ']' |
98 | #define SEP '/' | 98 | #define SEP '/' |
99 | #define STAR '*' | 99 | #define STAR '*' |
100 | #undef TILDE /* Some platforms may already define it */ | ||
100 | #define TILDE '~' | 101 | #define TILDE '~' |
101 | #define UNDERSCORE '_' | 102 | #define UNDERSCORE '_' |
102 | #define LBRACE '{' | 103 | #define LBRACE '{' |