- (tim) [defines.h] move chunk introduced in 1.125 before MAXPATHLEN so

it actually works.
This commit is contained in:
Tim Rice 2012-02-14 20:13:05 -08:00
parent e3609c935c
commit f79b5d38a1
2 changed files with 9 additions and 7 deletions

View File

@ -2,6 +2,8 @@
- (tim) [openbsd-compat/bsd-misc.h sshd.c] Fix conflicting return type for - (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 unsetenv due to rev 1.14 change to setenv.c. Cast unsetenv to void in sshd.c
ok dtucker@ ok dtucker@
- (tim) [defines.h] move chunk introduced in 1.125 before MAXPATHLEN so
it actually works.
20120214 20120214
- (djm) [openbsd-compat/bsd-cygwin_util.c] Add PROGRAMFILES to list of - (djm) [openbsd-compat/bsd-cygwin_util.c] Add PROGRAMFILES to list of

View File

@ -25,7 +25,7 @@
#ifndef _DEFINES_H #ifndef _DEFINES_H
#define _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 */ /* Constants */
@ -87,6 +87,12 @@ enum
# define IPTOS_DSCP_EF 0xb8 # define IPTOS_DSCP_EF 0xb8
#endif /* IPTOS_DSCP_EF */ #endif /* IPTOS_DSCP_EF */
#ifndef PATH_MAX
# ifdef _POSIX_PATH_MAX
# define PATH_MAX _POSIX_PATH_MAX
# endif
#endif
#ifndef MAXPATHLEN #ifndef MAXPATHLEN
# ifdef PATH_MAX # ifdef PATH_MAX
# define MAXPATHLEN PATH_MAX # define MAXPATHLEN PATH_MAX
@ -99,12 +105,6 @@ enum
# endif /* PATH_MAX */ # endif /* PATH_MAX */
#endif /* MAXPATHLEN */ #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 #if defined(HAVE_DECL_MAXSYMLINKS) && HAVE_DECL_MAXSYMLINKS == 0
# define MAXSYMLINKS 5 # define MAXSYMLINKS 5
#endif #endif