ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CXX_BUILD fixes

This commit is contained in:
twinaphex 2017-06-25 04:08:38 +02:00
parent 5d1cfc47cc
commit b74b0ceed5
1 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/drivers/tinyalsa.c
View File

@ -1126,14 +1126,14 @@ static int pcm_hw_mmap_status(struct pcm *pcm)
page_size = sysconf(_SC_PAGE_SIZE); page_size = sysconf(_SC_PAGE_SIZE);
pcm->mmap_status = mmap(NULL, page_size, PROT_READ, MAP_FILE | MAP_SHARED, pcm->mmap_status = (snd_pcm_mmap_status*)mmap(NULL, page_size, PROT_READ, MAP_FILE | MAP_SHARED,
pcm->fd, SNDRV_PCM_MMAP_OFFSET_STATUS); pcm->fd, SNDRV_PCM_MMAP_OFFSET_STATUS);
if (pcm->mmap_status == MAP_FAILED) if (pcm->mmap_status == MAP_FAILED)
pcm->mmap_status = NULL; pcm->mmap_status = NULL;
if (!pcm->mmap_status) if (!pcm->mmap_status)
goto mmap_error; goto mmap_error;
pcm->mmap_control = mmap(NULL, page_size, PROT_READ | PROT_WRITE, pcm->mmap_control = (snd_pcm_mmap_control*)mmap(NULL, page_size, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pcm->fd, SNDRV_PCM_MMAP_OFFSET_CONTROL); MAP_FILE | MAP_SHARED, pcm->fd, SNDRV_PCM_MMAP_OFFSET_CONTROL);
if (pcm->mmap_control == MAP_FAILED) if (pcm->mmap_control == MAP_FAILED)
pcm->mmap_control = NULL; pcm->mmap_control = NULL;
@ -1149,7 +1149,7 @@ static int pcm_hw_mmap_status(struct pcm *pcm)
mmap_error: mmap_error:
pcm->sync_ptr = calloc(1, sizeof(*pcm->sync_ptr)); pcm->sync_ptr = (snd_pcm_sync_ptr*)calloc(1, sizeof(*pcm->sync_ptr));
if (!pcm->sync_ptr) if (!pcm->sync_ptr)
return -ENOMEM; return -ENOMEM;
pcm->mmap_status = &pcm->sync_ptr->s.status; pcm->mmap_status = &pcm->sync_ptr->s.status;
@ -1786,12 +1786,10 @@ static int pcm_close(struct pcm *pcm)
static struct pcm *pcm_open(unsigned int card, unsigned int device, static struct pcm *pcm_open(unsigned int card, unsigned int device,
unsigned int flags, const struct pcm_config *config) unsigned int flags, const struct pcm_config *config)
{ {
struct pcm *pcm;
struct snd_pcm_info info;
char fn[256];
int rc; int rc;
char fn[256];
pcm = calloc(1, sizeof(struct pcm)); struct snd_pcm_info info;
struct pcm *pcm = (struct pcm*)calloc(1, sizeof(struct pcm));
if (!pcm) if (!pcm)
return &bad_pcm; return &bad_pcm;