mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create minmax.h for libchdr

Browse Source
This commit is contained in:
twinaphex 2017-09-21 19:28:10 +02:00
parent cff35f3611
commit c3b5981dc0
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretro-common/formats/libchdr/chd.c
View File

@ -49,13 +49,11 @@
#include "LzmaEnc.h" #include "LzmaEnc.h"
#include "LzmaDec.h" #include "LzmaDec.h"
#include "retro_inline.h" #include "retro_inline.h"
#include "minmax.h"
#define TRUE 1 #define TRUE 1
#define FALSE 0 #define FALSE 0
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
#define CHD_MAKE_TAG(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) #define CHD_MAKE_TAG(a,b,c,d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
/*************************************************************************** /***************************************************************************

3
libretro-common/formats/libchdr/flac.c
View File

@ -12,6 +12,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "flac.h" #include "flac.h"
#include "minmax.h"
/*************************************************************************** /***************************************************************************
* FLAC DECODER * FLAC DECODER
@ -206,8 +207,6 @@ uint32_t flac_decoder_finish(flac_decoder* decoder)
*------------------------------------------------- *-------------------------------------------------
*/ */
#define MIN(x, y) ((x) < (y) ? (x) : (y))
FLAC__StreamDecoderReadStatus flac_decoder_read_callback_static(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) FLAC__StreamDecoderReadStatus flac_decoder_read_callback_static(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
{ {
return flac_decoder_read_callback(client_data, buffer, bytes); return flac_decoder_read_callback(client_data, buffer, bytes);

21
libretro-common/formats/libchdr/minmax.h Normal file
View File

@ -0,0 +1,21 @@
/* license:BSD-3-Clause
* copyright-holders:Aaron Giles
***************************************************************************
minmax.h
***************************************************************************/
#pragma once
#ifndef __MINMAX_H__
#define __MINMAX_H__
#if defined(RARCH_INTERNAL) || defined(__LIBRETRO__)
#include <retro_miscellaneous.h>
#else
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
#endif
#endif