2 files changed, 6 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index d74f67d94..60a1fd753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006086
+ - (dtucker) [defines.h] With the includes.h changes we no longer get the
+   name clash on "YES" so we can remove the workaround for it.
+
 20060805
  - (djm) OpenBSD CVS Sync
    - stevesk@cvs.openbsd.org 2006/07/24 13:58:22
@@ -5194,4 +5198,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4474 2006/08/05 14:12:54 dtucker Exp $
+$Id: ChangeLog,v 1.4475 2006/08/06 11:23:27 dtucker Exp $
diff --git a/defines.h b/defines.h
index bcd4fc39b..fdc43cd92 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.135 2006/08/05 02:43:33 djm Exp $ */
+/* $Id: defines.h,v 1.136 2006/08/06 11:23:28 dtucker Exp $ */
 
 
 /* Constants */
@@ -723,12 +723,4 @@ struct winsize {
 # endif
 #endif
 
-/* some system headers on HP-UX define YES/NO */
-#ifdef YES
-# undef YES
-#endif
-#ifdef NO
-# undef NO
-#endif
-
 #endif /* _DEFINES_H */