mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-08 18:28:43 +00:00
Fix merge error during last update.
This commit is contained in:
@@ -418,12 +418,12 @@ InitShmImage(XParms xp, Parms p, int64_t reps, Bool read_only)
|
|||||||
free(segsa);
|
free(segsa);
|
||||||
free(segsb);
|
free(segsb);
|
||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
shm_image = *image;
|
shm_image = *image;
|
||||||
image_size = image->bytes_per_line * image->height;
|
image_size = image->bytes_per_line * image->height;
|
||||||
/* allow XYPixmap choice: */
|
/* allow XYPixmap choice: */
|
||||||
if(p->font)image_size *= xp->vinfo.depth;
|
if(p->font && strcmp(p->font, "XYBitmap") != 0) image_size *= xp->vinfo.depth;
|
||||||
shm_info.shmid = shmget(IPC_PRIVATE, image_size, IPC_CREAT|0700);
|
shm_info.shmid = shmget(IPC_PRIVATE, image_size, IPC_CREAT|0777);
|
||||||
if (shm_info.shmid < 0)
|
if (shm_info.shmid < 0)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
|||||||
Reference in New Issue
Block a user