From 1b6b10c32ba465a8f08b2c8a08fe24f6fd27f6d3 Mon Sep 17 00:00:00 2001 From: Adnan Munawar Date: Thu, 11 Nov 2021 18:26:32 -0500 Subject: [PATCH] Restoring changed files in external projects Introduced in commit 18db3e2aa8276f8caa762a056b631c8d71ae712f and 1204fec6daa4073d245842d1e61eb35bfbab0e89 --- external/libpng/src/gzlib.c | 2 -- external/libpng/src/gzread.c | 1 - external/libpng/src/gzwrite.c | 2 -- external/openal/include/alConfig.h | 4 +--- external/theoraplayer/src/TheoraDataSource.cpp | 6 +----- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/external/libpng/src/gzlib.c b/external/libpng/src/gzlib.c index 21a0be971..603e60ed5 100644 --- a/external/libpng/src/gzlib.c +++ b/external/libpng/src/gzlib.c @@ -4,8 +4,6 @@ */ #include "gzguts.h" -#include /* Many POSIX functions (but not all, by a large margin) */ -#include /* open(), creat() - and fcntl() */ #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 # define LSEEK lseek64 diff --git a/external/libpng/src/gzread.c b/external/libpng/src/gzread.c index 04920a4ea..548201ab0 100644 --- a/external/libpng/src/gzread.c +++ b/external/libpng/src/gzread.c @@ -4,7 +4,6 @@ */ #include "gzguts.h" -#include /* Local functions */ local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); diff --git a/external/libpng/src/gzwrite.c b/external/libpng/src/gzwrite.c index f0e66fb0c..e8defc688 100644 --- a/external/libpng/src/gzwrite.c +++ b/external/libpng/src/gzwrite.c @@ -4,8 +4,6 @@ */ #include "gzguts.h" -#include /* Many POSIX functions (but not all, by a large margin) */ -#include /* open(), creat() - and fcntl() */ /* Local functions */ local int gz_init OF((gz_statep)); diff --git a/external/openal/include/alConfig.h b/external/openal/include/alConfig.h index 01983d70e..2b5fbc7a9 100755 --- a/external/openal/include/alConfig.h +++ b/external/openal/include/alConfig.h @@ -71,9 +71,7 @@ #define HAVE_STDINT_H #define HAVE_DLFCN_H #define HAVE_MALLOC_H -#if defined (__arm__) - #define C_ENABLE_DELTA_DEVICE_SUPPORT -#endif +#define HAVE_CPUID_H #define HAVE_FLOAT_H #define HAVE_FENV_H #define HAVE_FESETROUND diff --git a/external/theoraplayer/src/TheoraDataSource.cpp b/external/theoraplayer/src/TheoraDataSource.cpp index 269eab4fa..c230375f0 100644 --- a/external/theoraplayer/src/TheoraDataSource.cpp +++ b/external/theoraplayer/src/TheoraDataSource.cpp @@ -120,11 +120,7 @@ TheoraMemoryFileDataSource::TheoraMemoryFileDataSource(std::string filename) : mData = new unsigned char[(unsigned int) mSize]; if (mSize < UINT_MAX) { - int systemRet = fread(mData, 1, (size_t) mSize, f); - - //if(systemRet == -1){ - // The system method failed - //} + fread(mData, 1, (size_t) mSize, f); } else {