diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /defines.h | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -25,7 +25,7 @@ | |||
25 | #ifndef _DEFINES_H | 25 | #ifndef _DEFINES_H |
26 | #define _DEFINES_H | 26 | #define _DEFINES_H |
27 | 27 | ||
28 | /* $Id: defines.h,v 1.171 2013/03/07 09:06:13 dtucker Exp $ */ | 28 | /* $Id: defines.h,v 1.172 2013/06/01 21:18:48 dtucker Exp $ */ |
29 | 29 | ||
30 | 30 | ||
31 | /* Constants */ | 31 | /* Constants */ |
@@ -171,11 +171,6 @@ enum | |||
171 | # define MAP_FAILED ((void *)-1) | 171 | # define MAP_FAILED ((void *)-1) |
172 | #endif | 172 | #endif |
173 | 173 | ||
174 | /* *-*-nto-qnx doesn't define this constant in the system headers */ | ||
175 | #ifdef MISSING_NFDBITS | ||
176 | # define NFDBITS (8 * sizeof(unsigned long)) | ||
177 | #endif | ||
178 | |||
179 | /* | 174 | /* |
180 | SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but | 175 | SCO Open Server 3 has INADDR_LOOPBACK defined in rpc/rpc.h but |
181 | including rpc/rpc.h breaks Solaris 6 | 176 | including rpc/rpc.h breaks Solaris 6 |
@@ -355,11 +350,19 @@ struct winsize { | |||
355 | }; | 350 | }; |
356 | #endif | 351 | #endif |
357 | 352 | ||
358 | /* *-*-nto-qnx does not define this type in the system headers */ | 353 | /* bits needed for select that may not be in the system headers */ |
359 | #ifdef MISSING_FD_MASK | 354 | #ifndef HAVE_FD_MASK |
360 | typedef unsigned long int fd_mask; | 355 | typedef unsigned long int fd_mask; |
361 | #endif | 356 | #endif |
362 | 357 | ||
358 | #if defined(HAVE_DECL_NFDBITS) && HAVE_DECL_NFDBITS == 0 | ||
359 | # define NFDBITS (8 * sizeof(unsigned long)) | ||
360 | #endif | ||
361 | |||
362 | #if defined(HAVE_DECL_HOWMANY) && HAVE_DECL_HOWMANY == 0 | ||
363 | # define howmany(x,y) (((x)+((y)-1))/(y)) | ||
364 | #endif | ||
365 | |||
363 | /* Paths */ | 366 | /* Paths */ |
364 | 367 | ||
365 | #ifndef _PATH_BSHELL | 368 | #ifndef _PATH_BSHELL |
@@ -484,11 +487,6 @@ struct winsize { | |||
484 | # define __nonnull__(x) | 487 | # define __nonnull__(x) |
485 | #endif | 488 | #endif |
486 | 489 | ||
487 | /* *-*-nto-qnx doesn't define this macro in the system headers */ | ||
488 | #ifdef MISSING_HOWMANY | ||
489 | # define howmany(x,y) (((x)+((y)-1))/(y)) | ||
490 | #endif | ||
491 | |||
492 | #ifndef OSSH_ALIGNBYTES | 490 | #ifndef OSSH_ALIGNBYTES |
493 | #define OSSH_ALIGNBYTES (sizeof(int) - 1) | 491 | #define OSSH_ALIGNBYTES (sizeof(int) - 1) |
494 | #endif | 492 | #endif |