tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [monitor_mm.c openbsd-compat/xmmap.c] Bug #940: cast constants 

to void * to appease picky compilers (eg Tru64's "cc -std1").
This commit is contained in:
Darren Tucker 2004-10-06 23:15:44 +10:00
parent b7d55e3eb5
commit dbc2296e2c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,8 @@
20041006 20041006
- (dtucker) [README.privsep] Bug #939: update info about HP-UX Trusted Mode - (dtucker) [README.privsep] Bug #939: update info about HP-UX Trusted Mode
and other PAM platforms. and other PAM platforms.
- (dtucker) [monitor_mm.c openbsd-compat/xmmap.c] Bug #940: cast constants
to void * to appease picky compilers (eg Tru64's "cc -std1").
20040930 20040930
- (dtucker) [configure.ac] Set AC_PACKAGE_NAME. ok djm@ - (dtucker) [configure.ac] Set AC_PACKAGE_NAME. ok djm@
@ -1761,4 +1763,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3557 2004/10/06 10:09:32 dtucker Exp $ $Id: ChangeLog,v 1.3558 2004/10/06 13:15:44 dtucker Exp $

2
monitor_mm.c
View File

@ -92,7 +92,7 @@ mm_create(struct mm_master *mmalloc, size_t size)
mm->mmalloc = mmalloc; mm->mmalloc = mmalloc;
address = xmmap(size); address = xmmap(size);
if (address == MAP_FAILED) if (address == (void *)MAP_FAILED)
fatal("mmap(%lu): %s", (u_long)size, strerror(errno)); fatal("mmap(%lu): %s", (u_long)size, strerror(errno));
mm->address = address; mm->address = address;

4
openbsd-compat/xmmap.c
View File

@ -23,7 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* $Id: xmmap.c,v 1.5 2004/08/14 13:55:38 dtucker Exp $ */ /* $Id: xmmap.c,v 1.6 2004/10/06 13:15:44 dtucker Exp $ */
#include "includes.h" #include "includes.h"
@ -47,7 +47,7 @@ void *xmmap(size_t size)
# endif # endif
#define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX" #define MM_SWAP_TEMPLATE "/var/run/sshd.mm.XXXXXXXX"
if (address == MAP_FAILED) { if (address == (void *)MAP_FAILED) {
char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE; char tmpname[sizeof(MM_SWAP_TEMPLATE)] = MM_SWAP_TEMPLATE;
int tmpfd; int tmpfd;
mode_t old_umask; mode_t old_umask;