summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--defines.h10
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 @@
12006086
2 - (dtucker) [defines.h] With the includes.h changes we no longer get the
3 name clash on "YES" so we can remove the workaround for it.
4
120060805 520060805
2 - (djm) OpenBSD CVS Sync 6 - (djm) OpenBSD CVS Sync
3 - stevesk@cvs.openbsd.org 2006/07/24 13:58:22 7 - stevesk@cvs.openbsd.org 2006/07/24 13:58:22
@@ -5194,4 +5198,4 @@
5194 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5198 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5195 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5199 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5196 5200
5197$Id: ChangeLog,v 1.4474 2006/08/05 14:12:54 dtucker Exp $ 5201$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 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.135 2006/08/05 02:43:33 djm Exp $ */ 28/* $Id: defines.h,v 1.136 2006/08/06 11:23:28 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -723,12 +723,4 @@ struct winsize {
723# endif 723# endif
724#endif 724#endif
725 725
726/* some system headers on HP-UX define YES/NO */
727#ifdef YES
728# undef YES
729#endif
730#ifdef NO
731# undef NO
732#endif
733
734#endif /* _DEFINES_H */ 726#endif /* _DEFINES_H */