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

   to void * to appease picky compilers (eg Tru64's "cc -std1").

3 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 975637071..6baa4bc66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20041006
  - (dtucker) [README.privsep] Bug #939: update info about HP-UX Trusted Mode
    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
  - (dtucker) [configure.ac] Set AC_PACKAGE_NAME.  ok djm@
@@ -1761,4 +1763,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (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 $
diff --git a/monitor_mm.c b/monitor_mm.c
index ff523a5b1..b0ec37cff 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -92,7 +92,7 @@ mm_create(struct mm_master *mmalloc, size_t size)
         mm->mmalloc = mmalloc;
 
         address = xmmap(size);
-        if (address == MAP_FAILED)
+        if (address == (void *)MAP_FAILED)
                 fatal("mmap(%lu): %s", (u_long)size, strerror(errno));
 
         mm->address = address;
diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c
index c8d59dee0..74e8a8b13 100644
--- a/openbsd-compat/xmmap.c
+++ b/openbsd-compat/xmmap.c
@@ -23,7 +23,7 @@
  * 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"
 
@@ -47,7 +47,7 @@ void *xmmap(size_t size)
 # endif
 
 #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;
                 int tmpfd;
                 mode_t old_umask;