diff options
| author | Tim Rice <tim@multitalents.net> | 2012-02-15 05:13:05 +0100 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2012-02-15 05:13:05 +0100 |
| commit | f79b5d38a1d2ee6402cda1f98dc957fe97755712 (patch) | |
| tree | e654a294953635c98105b7f6da5194916c59353e | |
| parent | - (tim) [openbsd-compat/bsd-misc.h sshd.c] Fix conflicting return type for (diff) | |
| download | openssh-f79b5d38a1d2ee6402cda1f98dc957fe97755712.tar.xz openssh-f79b5d38a1d2ee6402cda1f98dc957fe97755712.zip | |
- (tim) [defines.h] move chunk introduced in 1.125 before MAXPATHLEN so
it actually works.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | defines.h | 14 |
2 files changed, 9 insertions, 7 deletions
@@ -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 @@ -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 |