From 725286e2239ad3a2f918602a40bd43a94739e6d6 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 11 Jun 2007 14:44:02 +1000
Subject:  - (dtucker) [includes.h] Bug #1243: HAVE_PATHS -> HAVE_PATHS_H. 
 Should    prevent warnings about redefinitions of various things in paths.h. 
   Spotted by cartmanltd at hotmail.com.

---
 ChangeLog  | 5 ++++-
 includes.h | 2 +-
 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 @@
  - (dtucker) [openbsd-compat/bsd-misc.c] According to the spec the "remainder"
    argument to nanosleep may be NULL.  Currently this never happens in OpenSSH,
    but check anyway in case this changes or the code gets used elsewhere.
+ - (dtucker) [includes.h] Bug #1243: HAVE_PATHS -> HAVE_PATHS_H.  Should
+   prevent warnings about redefinitions of various things in paths.h.
+   Spotted by cartmanltd at hotmail.com.
 
 20070605
  - (dtucker) OpenBSD CVS Sync
@@ -3004,4 +3007,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4686 2007/06/11 04:34:53 dtucker Exp $
+$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 @@
 #ifdef HAVE_NEXT
 # include <libc.h>
 #endif
-#ifdef HAVE_PATHS
+#ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
 
-- 
cgit v1.2.3