summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2012-02-14 20:13:05 -0800
committerTim Rice <tim@multitalents.net>2012-02-14 20:13:05 -0800
commitf79b5d38a1d2ee6402cda1f98dc957fe97755712 (patch)
treee654a294953635c98105b7f6da5194916c59353e
parente3609c935c93d680e39b9649520bc052576f7fc4 (diff)
- (tim) [defines.h] move chunk introduced in 1.125 before MAXPATHLEN so
it actually works.
-rw-r--r--ChangeLog2
-rw-r--r--defines.h14
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 201f2cb1..ce88d919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
- (tim) [openbsd-compat/bsd-misc.h sshd.c] Fix conflicting return type for
unsetenv due to rev 1.14 change to setenv.c. Cast unsetenv to void in sshd.c
ok dtucker@
+ - (tim) [defines.h] move chunk introduced in 1.125 before MAXPATHLEN so
+ it actually works.
20120214
- (djm) [openbsd-compat/bsd-cygwin_util.c] Add PROGRAMFILES to list of
diff --git a/defines.h b/defines.h
index 45612aab..53f83a14 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.168 2011/09/29 01:11:56 djm Exp $ */
+/* $Id: defines.h,v 1.169 2012/02/15 04:13:06 tim Exp $ */
/* Constants */
@@ -87,6 +87,12 @@ enum
# define IPTOS_DSCP_EF 0xb8
#endif /* IPTOS_DSCP_EF */
+#ifndef PATH_MAX
+# ifdef _POSIX_PATH_MAX
+# define PATH_MAX _POSIX_PATH_MAX
+# endif
+#endif
+
#ifndef MAXPATHLEN
# ifdef PATH_MAX
# define MAXPATHLEN PATH_MAX
@@ -99,12 +105,6 @@ enum
# endif /* PATH_MAX */
#endif /* MAXPATHLEN */
-#ifndef PATH_MAX
-# ifdef _POSIX_PATH_MAX
-# define PATH_MAX _POSIX_PATH_MAX
-# endif
-#endif
-
#if defined(HAVE_DECL_MAXSYMLINKS) && HAVE_DECL_MAXSYMLINKS == 0
# define MAXSYMLINKS 5
#endif