- (bal) glob.c defines TILDE and AIX also defines it. #undef it first.

   bug #265

diff --git a/ChangeLog b/ChangeLog
index 800759837c643a6950934f74a4f321cfef413301..d68b5461b1fcbf859267680c3a27d88b2fbac740 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20020704
  - (bal) Limit data to TTY for AIX only (Newer versions can't handle the
    faster data rate)  Bug #124
+ - (bal) glob.c defines TILDE and AIX also defines it.  #undef it first.
+   bug #265
  
 20020703
  - (bal) Updated contrib/cygwin/  patch by vinschen@redhat.com 
@@ -1271,4 +1273,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2333 2002/07/04 18:11:09 mouring Exp $
+$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 365d4334fc5d6ced0024b242a0042f83bc6bd7b8..14c91420dc1c10525e6b472db6c67d0b46d877ea 100644 (file)
--- 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 $
 #define        RBRACKET        ']'
 #define        SEP             '/'
 #define        STAR            '*'
+#undef TILDE                   /* Some platforms may already define it */
 #define        TILDE           '~'
 #define        UNDERSCORE      '_'
 #define        LBRACE          '{'