Fix guards for headers in third party
Bug: webrtc:8366 Change-Id: I86309265c822dd4430c5578d813bdddc77102d05 Reviewed-on: https://webrtc-review.googlesource.com/90416 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24203}
This commit is contained in:
parent
9a29c03355
commit
10d70caa13
6
common_audio/third_party/fft4g/fft4g.h
vendored
6
common_audio/third_party/fft4g/fft4g.h
vendored
@ -8,8 +8,8 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#ifndef COMMON_AUDIO_FFT4G_H_
|
||||
#define COMMON_AUDIO_FFT4G_H_
|
||||
#ifndef COMMON_AUDIO_THIRD_PARTY_FFT4G_FFT4G_H_
|
||||
#define COMMON_AUDIO_THIRD_PARTY_FFT4G_FFT4G_H_
|
||||
|
||||
#if defined(__cplusplus)
|
||||
extern "C" {
|
||||
@ -22,4 +22,4 @@ void WebRtc_rdft(size_t n, int isgn, float* a, size_t* ip, float* w);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // COMMON_AUDIO_FFT4G_H_
|
||||
#endif /* COMMON_AUDIO_THIRD_PARTY_FFT4G_FFT4G_H_ */
|
||||
|
||||
6
modules/third_party/g711/g711.h
vendored
6
modules/third_party/g711/g711.h
vendored
@ -43,8 +43,8 @@ difficult to achieve the precise transcoding procedure laid down in the G.711
|
||||
specification by other means.
|
||||
*/
|
||||
|
||||
#if !defined(_G711_H_)
|
||||
#define _G711_H_
|
||||
#ifndef MODULES_THIRD_PARTY_G711_G711_H_
|
||||
#define MODULES_THIRD_PARTY_G711_G711_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -347,4 +347,4 @@ uint8_t ulaw_to_alaw(uint8_t ulaw);
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif /* MODULES_THIRD_PARTY_G711_G711_H_ */
|
||||
|
||||
6
modules/third_party/g722/g722_enc_dec.h
vendored
6
modules/third_party/g722/g722_enc_dec.h
vendored
@ -27,8 +27,8 @@
|
||||
|
||||
/*! \file */
|
||||
|
||||
#if !defined(_G722_ENC_DEC_H_)
|
||||
#define _G722_ENC_DEC_H_
|
||||
#ifndef MODULES_THIRD_PARTY_G722_G722_H_
|
||||
#define MODULES_THIRD_PARTY_G722_G722_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -150,4 +150,4 @@ size_t WebRtc_g722_decode(G722DecoderState* s,
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif /* MODULES_THIRD_PARTY_G722_G722_H_ */
|
||||
|
||||
@ -60,6 +60,9 @@
|
||||
*
|
||||
****************/
|
||||
|
||||
#ifndef MODULES_THIRD_PARTY_PORTAUDIO_PA_MEMORYBARRIER_H_
|
||||
#define MODULES_THIRD_PARTY_PORTAUDIO_PA_MEMORYBARRIER_H_
|
||||
|
||||
#if defined(__APPLE__)
|
||||
#include <libkern/OSAtomic.h>
|
||||
/* Here are the memory barrier functions. Mac OS X only provides
|
||||
@ -125,3 +128,5 @@
|
||||
# error Memory barriers are not defined on this system. You can still compile by defining ALLOW_SMP_DANGERS, but SMP safety will not be guaranteed.
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* MODULES_THIRD_PARTY_PORTAUDIO_PA_MEMORYBARRIER_H_ */
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef AUDIO_DEVICE_PA_RINGBUFFER_H_
|
||||
#define AUDIO_DEVICE_PA_RINGBUFFER_H_
|
||||
#ifndef MODULES_THIRD_PARTY_PORTAUDIO_PA_RINGBUFFER_H_
|
||||
#define MODULES_THIRD_PARTY_PORTAUDIO_PA_RINGBUFFER_H_
|
||||
/*
|
||||
* $Id: pa_ringbuffer.h 1421 2009-11-18 16:09:05Z bjornroche $
|
||||
* Portable Audio I/O Library
|
||||
@ -248,4 +248,4 @@ PaRingBufferSize PaUtil_AdvanceRingBufferReadIndex(
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
#endif /* MODULES_AUDIO_DEVICE_MAIN_SOURCE_MAC_PORTAUDIO_PA_RINGBUFFER_H_ */
|
||||
#endif /* MODULES_THIRD_PARTY_PORTAUDIO_PA_RINGBUFFER_H_ */
|
||||
|
||||
6
rtc_base/third_party/base64/base64.h
vendored
6
rtc_base/third_party/base64/base64.h
vendored
@ -9,8 +9,8 @@
|
||||
//* intact.
|
||||
//*********************************************************************
|
||||
|
||||
#ifndef RTC_BASE_BASE64_H_
|
||||
#define RTC_BASE_BASE64_H_
|
||||
#ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
|
||||
#define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
@ -120,4 +120,4 @@ class Base64 {
|
||||
|
||||
} // namespace rtc
|
||||
|
||||
#endif // RTC_BASE_BASE64_H_
|
||||
#endif /* RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ */
|
||||
|
||||
6
rtc_base/third_party/sigslot/sigslot.h
vendored
6
rtc_base/third_party/sigslot/sigslot.h
vendored
@ -93,8 +93,8 @@
|
||||
// If signalx is single threaded the user must ensure that disconnect, connect
|
||||
// or signal is not happening concurrently or data race may occur.
|
||||
|
||||
#ifndef RTC_BASE_SIGSLOT_H_
|
||||
#define RTC_BASE_SIGSLOT_H_
|
||||
#ifndef RTC_BASE_THIRD_PARTY_SIGSLOT_SIGSLOT_H_
|
||||
#define RTC_BASE_THIRD_PARTY_SIGSLOT_SIGSLOT_H_
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <cstring>
|
||||
@ -641,4 +641,4 @@ using signal8 =
|
||||
|
||||
} // namespace sigslot
|
||||
|
||||
#endif // RTC_BASE_SIGSLOT_H_
|
||||
#endif /* RTC_BASE_THIRD_PARTY_SIGSLOT_SIGSLOT_H_ */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user