summaryrefslogtreecommitdiffstats
path: root/g10/status.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/status.c')
-rw-r--r--g10/status.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/status.c b/g10/status.c
index 3b9e197b8..e441d5e21 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -152,7 +152,8 @@ init_shm_coprocessing ( ulong requested_shm_size, int lock_mem )
else
shm_is_locked = 1;
#elif defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
- if ( mlock (shm_area, shm_size) )
+ /* (need the cast for Solaris with Sun's workshop compilers) */
+ if ( mlock ( (char*)shm_area, shm_size) )
log_info("locking shared memory %d failed: %s\n",
shm_id, strerror(errno));
else
@@ -307,7 +308,8 @@ cpr_kill_prompt(void)
if( opt.shm_coprocess )
return;
#endif
- return tty_kill_prompt();
+ tty_kill_prompt();
+ return;
}
int