Merge pull request #4533 from aliaspider/master

build fix for console targets.
This commit is contained in:
Twinaphex 2017-01-31 03:29:43 +01:00 committed by GitHub
commit c9e14b7c5c
4 changed files with 7 additions and 2 deletions

View File

@ -16,6 +16,7 @@
#include <3ds.h>
#include <string.h>
#include <malloc.h>
#include <retro_miscellaneous.h>
#include "../audio_driver.h"

6
deps/zlib/crc32.c vendored
View File

@ -1,6 +1,8 @@
#ifndef _S_CRC32_H
#define _S_CRC32_H
#include <compat/zlib.h>
#ifdef __cplusplus
extern "C" {
#endif
@ -80,9 +82,9 @@ extern "C" {
return crc ^ 0xffffffffL;
}
const unsigned long * get_crc_table()
const z_crc_t FAR * ZEXPORT get_crc_table()
{
return crc_table;
return (const z_crc_t FAR *)crc_table;
}
#ifdef __cplusplus

View File

@ -19,6 +19,7 @@
#include <boolean.h>
#include <libretro.h>
#include <retro_miscellaneous.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"

View File

@ -20,6 +20,7 @@
#include "../input_joypad_driver.h"
#include "../input_driver.h"
#include "../input_config.h"
#include "../../tasks/tasks_internal.h"