summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--includes.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ee5db5b2c..bb9c59899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
29 - (dtucker) [openbsd-compat/bsd-misc.c] According to the spec the "remainder" 29 - (dtucker) [openbsd-compat/bsd-misc.c] According to the spec the "remainder"
30 argument to nanosleep may be NULL. Currently this never happens in OpenSSH, 30 argument to nanosleep may be NULL. Currently this never happens in OpenSSH,
31 but check anyway in case this changes or the code gets used elsewhere. 31 but check anyway in case this changes or the code gets used elsewhere.
32 - (dtucker) [includes.h] Bug #1243: HAVE_PATHS -> HAVE_PATHS_H. Should
33 prevent warnings about redefinitions of various things in paths.h.
34 Spotted by cartmanltd at hotmail.com.
32 35
3320070605 3620070605
34 - (dtucker) OpenBSD CVS Sync 37 - (dtucker) OpenBSD CVS Sync
@@ -3004,4 +3007,4 @@
3004 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3007 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3005 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3008 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3006 3009
3007$Id: ChangeLog,v 1.4686 2007/06/11 04:34:53 dtucker Exp $ 3010$Id: ChangeLog,v 1.4687 2007/06/11 04:44:02 dtucker Exp $
diff --git a/includes.h b/includes.h
index 967fcc26c..9fcf1b023 100644
--- a/includes.h
+++ b/includes.h
@@ -49,7 +49,7 @@
49#ifdef HAVE_NEXT 49#ifdef HAVE_NEXT
50# include <libc.h> 50# include <libc.h>
51#endif 51#endif
52#ifdef HAVE_PATHS 52#ifdef HAVE_PATHS_H
53# include <paths.h> 53# include <paths.h>
54#endif 54#endif
55 55