diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-11-08 11:25:20 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-11-08 11:25:20 -0500 |
| commit | 1ecb7eaeafad60604ecb04adb25952dba6f40765 (patch) | |
| tree | 0b68637f6b1ea58d1d698b2f8e2e7b8a551dfb88 /include/opus_custom.h | |
| parent | 6906210cb0083f6a23acf0d34ddf576be5074f25 (diff) | |
| download | libopus-1ecb7eaeafad60604ecb04adb25952dba6f40765.tar.gz | |
Fixes issues with multiple files defining CELT_C
Diffstat (limited to 'include/opus_custom.h')
| -rw-r--r-- | include/opus_custom.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/opus_custom.h b/include/opus_custom.h index 8415a7b9..6cf39630 100644 --- a/include/opus_custom.h +++ b/include/opus_custom.h @@ -46,7 +46,7 @@ extern "C" { # define OPUS_CUSTOM_EXPORT_STATIC OPUS_EXPORT #else # define OPUS_CUSTOM_EXPORT -# ifdef CELT_C +# ifdef OPUS_BUILD # define OPUS_CUSTOM_EXPORT_STATIC static inline # else # define OPUS_CUSTOM_EXPORT_STATIC @@ -127,7 +127,7 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomMode *opus_custom_mode_crea OPUS_CUSTOM_EXPORT void opus_custom_mode_destroy(OpusCustomMode *mode); -#if defined(CELT_C) && defined(ENCODER) +#if !defined(OPUS_BUILD) || defined(CELT_ENCODER_C) /* Encoder */ /** Gets the size of an OpusCustomEncoder structure. @@ -237,7 +237,7 @@ OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode( OPUS_CUSTOM_EXPORT int opus_custom_encoder_ctl(OpusCustomEncoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1); -#if defined(CELT_C) && defined(DECODER) +#if !defined(OPUS_BUILD) || defined(CELT_DECODER_C) /* Decoder */ /** Gets the size of an OpusCustomDecoder structure. |