From bf228f8b4469f97a0c72a3761eb8dd5b23c9a6c8 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 10 Feb 2009 15:44:00 -0800 Subject: auto import from //branches/cupcake/...@130745 --- arm-wt-22k/lib_src/eas_mdls.c | 2 +- arm-wt-22k/lib_src/eas_public.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'arm-wt-22k/lib_src') diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c index 7950d90..3da3b06 100644 --- a/arm-wt-22k/lib_src/eas_mdls.c +++ b/arm-wt-22k/lib_src/eas_mdls.c @@ -1276,7 +1276,7 @@ static EAS_RESULT Parse_data (SDLS_SYNTHESIZER_DATA *pDLSData, EAS_I32 pos, EAS_ return EAS_SUCCESS; } -#elif defined_16_BIT_SAMPLES) +#elif defined(_16_BIT_SAMPLES) #error "16-bit DLS conversion not implemented yet" #else #error "Must specifiy _8_BIT_SAMPLES or _16_BIT_SAMPLES" diff --git a/arm-wt-22k/lib_src/eas_public.c b/arm-wt-22k/lib_src/eas_public.c index 234e8cd..d67ef7e 100644 --- a/arm-wt-22k/lib_src/eas_public.c +++ b/arm-wt-22k/lib_src/eas_public.c @@ -615,9 +615,7 @@ EAS_RESULT EAS_OpenJETStream (EAS_DATA_HANDLE pEASData, EAS_FILE_HANDLE fileHand * *---------------------------------------------------------------------------- */ -extern int *EAS_HWGetMemFailVar(EAS_FILE_HANDLE); - -EAS_PUBLIC EAS_RESULT EAS_OpenFile (EAS_DATA_HANDLE pEASData, EAS_FILE_LOCATOR locator, EAS_HANDLE *ppStream, int **memfailvar) +EAS_PUBLIC EAS_RESULT EAS_OpenFile (EAS_DATA_HANDLE pEASData, EAS_FILE_LOCATOR locator, EAS_HANDLE *ppStream) { EAS_RESULT result; EAS_FILE_HANDLE fileHandle; @@ -658,10 +656,6 @@ EAS_PUBLIC EAS_RESULT EAS_OpenFile (EAS_DATA_HANDLE pEASData, EAS_FILE_LOCATOR l /* save the parser pointer and file handle */ EAS_InitStream(&pEASData->streams[streamNum], pParserModule, streamHandle); *ppStream = &pEASData->streams[streamNum]; - if (memfailvar) - { - *memfailvar = EAS_HWGetMemFailVar(fileHandle); - } return EAS_SUCCESS; } -- cgit v1.2.3