- (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.

diff --git a/ChangeLog b/ChangeLog
index a8a33d3fd8b1b1e00ce73b57c5a72dd769759449..3915a4daf57a95d70e2003b94dd83a0a281a0035 100644 (file)
--- 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

diff --git a/includes.h b/includes.h
index 967fcc26c84b385840f34428ef5bdcb06fe31586..9fcf1b023287c0965f0263086da78085cc666aee 100644 (file)
--- 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