Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
eda3dcc8
Commit
eda3dcc8
authored
Nov 01, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some warnings in the Speex resampler.
parent
12c7babe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
13 deletions
+12
-13
extras/speex_resampler/ma_speex_resampler.h
extras/speex_resampler/ma_speex_resampler.h
+12
-13
No files found.
extras/speex_resampler/ma_speex_resampler.h
View file @
eda3dcc8
...
@@ -6,21 +6,20 @@
...
@@ -6,21 +6,20 @@
#define RANDOM_PREFIX ma_speex
#define RANDOM_PREFIX ma_speex
#include "thirdparty/speex_resampler.h"
#include "thirdparty/speex_resampler.h"
#ifdef _MSC_VER
#if defined(_MSC_VER)
#if defined(__clang__)
typedef
unsigned
__int64
spx_uint64_t
;
#else
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
#pragma GCC diagnostic push
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wlanguage-extension-token"
#pragma GCC diagnostic ignored "-Wlong-long"
#pragma GCC diagnostic ignored "-Wlong-long"
#if defined(__clang__)
#pragma GCC diagnostic ignored "-Wc++11-long-long"
#pragma GCC diagnostic ignored "-Wc++11-long-long"
#endif
#endif
#endif
typedef
unsigned
__int64
spx_uint64_t
;
typedef
unsigned
long
long
spx_uint64_t
;
#if defined(__clang__)
#if defined(__clang__)
|| (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
#pragma GCC diagnostic pop
#pragma GCC diagnostic pop
#endif
#endif
#else
#define MA_HAS_STDINT
#include <stdint.h>
typedef
uint64_t
spx_uint64_t
;
#endif
#endif
int
ma_speex_resampler_get_required_input_frame_count
(
SpeexResamplerState
*
st
,
spx_uint64_t
out_len
,
spx_uint64_t
*
in_len
);
int
ma_speex_resampler_get_required_input_frame_count
(
SpeexResamplerState
*
st
,
spx_uint64_t
out_len
,
spx_uint64_t
*
in_len
);
...
@@ -50,14 +49,14 @@ int ma_speex_resampler_get_expected_output_frame_count(SpeexResamplerState* st,
...
@@ -50,14 +49,14 @@ int ma_speex_resampler_get_expected_output_frame_count(SpeexResamplerState* st,
#pragma warning(disable:4244)
/* conversion from 'x' to 'y', possible loss of data */
#pragma warning(disable:4244)
/* conversion from 'x' to 'y', possible loss of data */
#pragma warning(disable:4018)
/* signed/unsigned mismatch */
#pragma warning(disable:4018)
/* signed/unsigned mismatch */
#pragma warning(disable:4706)
/* assignment within conditional expression */
#pragma warning(disable:4706)
/* assignment within conditional expression */
#el
se
#el
if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
#pragma GCC diagnostic push
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsign-compare"
/* comparison between signed and unsigned integer expressions */
#pragma GCC diagnostic ignored "-Wsign-compare"
/* comparison between signed and unsigned integer expressions */
#endif
#endif
#include "thirdparty/resample.c"
#include "thirdparty/resample.c"
#if defined(_MSC_VER) && !defined(__clang__)
#if defined(_MSC_VER) && !defined(__clang__)
#pragma warning(pop)
#pragma warning(pop)
#el
se
#el
if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
#pragma GCC diagnostic pop
#pragma GCC diagnostic pop
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment