generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove redundant STR_CASE_CMP macro definitions.

Browse Source 
R=minyue@webrtc.org, turaj@webrtc.org, xians@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2187005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4711 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2013-09-09 17:50:10 +00:00
parent a19c9f4173
commit eda189be14
8 changed files with 19 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/common_types.h
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_COMMON_TYPES_H
#define WEBRTC_COMMON_TYPES_H
#ifndef WEBRTC_COMMON_TYPES_H_
#define WEBRTC_COMMON_TYPES_H_
#include "typedefs.h"
#include "webrtc/typedefs.h"
#if defined(_MSC_VER)
// Disable "new behavior: elements of array will be default initialized"
@ -33,6 +33,16 @@
#define RTP_PAYLOAD_NAME_SIZE 32
#if defined(WEBRTC_WIN)
// Compares two strings without regard to case.
#define STR_CASE_CMP(s1, s2) ::_stricmp(s1, s2)
// Compares characters of two strings without regard to case.
#define STR_NCASE_CMP(s1, s2, n) ::_strnicmp(s1, s2, n)
#else
#define STR_CASE_CMP(s1, s2) ::strcasecmp(s1, s2)
#define STR_NCASE_CMP(s1, s2, n) ::strncasecmp(s1, s2, n)
#endif
namespace webrtc {
class Config;
@ -590,5 +600,8 @@ struct OverUseDetectorOptions {
double initial_var_noise;
double initial_threshold;
};
} // namespace webrtc
#endif // WEBRTC_COMMON_TYPES_H
#endif // WEBRTC_COMMON_TYPES_H_

8
webrtc/modules/audio_coding/main/source/acm_common_defs.h
View File

@ -24,14 +24,6 @@
#error iSAC and iSACFX codecs cannot be enabled at the same time
#endif
#ifdef WIN32
// OS-dependent case-insensitive string comparison
#define STR_CASE_CMP(x, y) ::_stricmp(x, y)
#else
// OS-dependent case-insensitive string comparison
#define STR_CASE_CMP(x, y) ::strcasecmp(x, y)
#endif
namespace webrtc {
// 60 ms is the maximum block size we support. An extra 20 ms is considered

8
webrtc/modules/media_file/source/media_file_impl.cc
View File

@ -16,14 +16,6 @@
#include "webrtc/system_wrappers/interface/tick_util.h"
#include "webrtc/system_wrappers/interface/trace.h"
#if (defined(WIN32) || defined(WINCE))
#define STR_CASE_CMP _stricmp
#define STR_NCASE_CMP _strnicmp
#else
#define STR_CASE_CMP strcasecmp
#define STR_NCASE_CMP strncasecmp
#endif
namespace webrtc {
MediaFile* MediaFile::CreateMediaFile(const int32_t id)
{

8
webrtc/modules/media_file/source/media_file_utility.cc
View File

@ -23,14 +23,6 @@
#include "avi_file.h"
#endif
#if (defined(WIN32) || defined(WINCE))
#define STR_CASE_CMP _stricmp
#define STR_NCASE_CMP _strnicmp
#else
#define STR_CASE_CMP strcasecmp
#define STR_NCASE_CMP strncasecmp
#endif
namespace {
enum WaveFormats
{

7
webrtc/modules/utility/source/coder.cc
View File

@ -12,13 +12,6 @@
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/utility/source/coder.h"
// OS independent case insensitive string comparison.
#ifdef WIN32
#define STR_CASE_CMP(x,y) ::_stricmp(x,y)
#else
#define STR_CASE_CMP(x,y) ::strcasecmp(x,y)
#endif
namespace webrtc {
AudioCoder::AudioCoder(uint32_t instanceID)
: _acm(AudioCodingModule::Create(instanceID)),

7
webrtc/modules/utility/source/file_player_impl.cc
View File

@ -17,13 +17,6 @@
#include "video_coder.h"
#endif
// OS independent case insensitive string comparison.
#ifdef WIN32
#define STR_CASE_CMP(x,y) ::_stricmp(x,y)
#else
#define STR_CASE_CMP(x,y) ::strcasecmp(x,y)
#endif
namespace webrtc {
FilePlayer* FilePlayer::CreateFilePlayer(uint32_t instanceID,
FileFormats fileFormat)

7
webrtc/modules/utility/source/file_recorder_impl.cc
View File

@ -21,13 +21,6 @@
#include "video_frames_queue.h"
#endif
// OS independent case insensitive string comparison.
#ifdef WIN32
#define STR_CASE_CMP(x,y) ::_stricmp(x,y)
#else
#define STR_CASE_CMP(x,y) ::strcasecmp(x,y)
#endif
namespace webrtc {
FileRecorder* FileRecorder::CreateFileRecorder(uint32_t instanceID,
FileFormats fileFormat)

15
webrtc/voice_engine/voice_engine_defines.h
View File

@ -136,12 +136,6 @@ enum { kVoiceEngineMaxRtpExtensionId = 14 };
#define WEBRTC_VOICE_ENGINE_RX_NS_DEFAULT_MODE NoiseSuppression::kModerate
// AudioProcessing RX NS mode
// Macros
// Comparison of two strings without regard to case
#define STR_CASE_CMP(x,y) ::_stricmp(x,y)
// Compares characters of two strings without regard to case
#define STR_NCASE_CMP(x,y,n) ::_strnicmp(x,y,n)
// ----------------------------------------------------------------------------
// Build information macros
// ----------------------------------------------------------------------------
@ -225,6 +219,8 @@ inline int VoEChannelId(int moduleId)
#if defined(_WIN32)
#include <windows.h>
#pragma comment( lib, "winmm.lib" )
#ifndef WEBRTC_EXTERNAL_TRANSPORT
@ -235,13 +231,6 @@ inline int VoEChannelId(int moduleId)
// Defines
// ----------------------------------------------------------------------------
#include <windows.h>
// Comparison of two strings without regard to case
#define STR_CASE_CMP(x,y) ::_stricmp(x,y)
// Compares characters of two strings without regard to case
#define STR_NCASE_CMP(x,y,n) ::_strnicmp(x,y,n)
// Default device for Windows PC
#define WEBRTC_VOICE_ENGINE_DEFAULT_DEVICE \
AudioDeviceModule::kDefaultCommunicationDevice