On Thu, Feb 08, 2018 at 03:17:03PM +0100, Diego Biurrun wrote: > On Wed, Feb 07, 2018 at 06:39:39PM +0000, Mironov, Mikhail wrote: > > I quickly searched but did not find any formal standard on include guards. > > I did see some recommendations in forums though. > > I suggest searching the C99 standard instead of random forums: > > ISO/IEC 9899:1999 (E) > 7.1.3 Reserved identifiers > — All identifiers that begin with an underscore and either an uppercase > letter or another > underscore are always reserved for any use. > > > To get some statistics: I checked few header files in Windows SDK, OpenCL > > SDK, OpenGL, Intel Media SDK - I see all kind of styles including > > __FILE_H__. > > For example: > > https://github.com/Intel-Media-SDK/MediaSDK/blob/master/api/include/mfxvideo.h > > Yes, bad practices abound. People look at kernel headers or libc headers > and wrongly believe that that is the example to follow. Then others look > at other projects for inspiration and cargo cult the error around. > > Please be a good example and fix it instead of perpetuating this > malpractice. It's as easy as > > find . -name \*.h | xargs sed -i -e 's/ __AMF\(.*\)__/ AMF_\1/' > > from the root of the AMF source tree or the include dir (requires GNU sed).
Did that for you, please apply the attached patch. Diego
>From 42544648c332fa48d846632cf1d1f38571171379 Mon Sep 17 00:00:00 2001 From: Diego Biurrun <[email protected]> Date: Sun, 11 Feb 2018 18:51:39 +0100 Subject: [PATCH] Do not use C99-reserved identifiers as multiple inclusion guards Identifiers starting with __ or _ and a capital letter are reserved, see section 7.1.3 Reserved identifiers of the C99 standard. --- amf/public/include/components/Ambisonic2SRenderer.h | 6 +++--- amf/public/include/components/AudioCapture.h | 6 +++--- amf/public/include/components/Component.h | 6 +++--- amf/public/include/components/ComponentCaps.h | 6 +++--- amf/public/include/components/DisplayCapture.h | 6 +++--- amf/public/include/components/FFMPEGAudioConverter.h | 6 +++--- amf/public/include/components/FFMPEGAudioDecoder.h | 6 +++--- amf/public/include/components/FFMPEGAudioEncoder.h | 6 +++--- amf/public/include/components/FFMPEGComponents.h | 6 +++--- amf/public/include/components/FFMPEGFileDemuxer.h | 6 +++--- amf/public/include/components/FFMPEGFileMuxer.h | 6 +++--- amf/public/include/components/MediaSource.h | 6 +++--- amf/public/include/components/VideoConverter.h | 6 +++--- amf/public/include/components/VideoEncoderHEVC.h | 6 +++--- amf/public/include/components/VideoEncoderVCE.h | 6 +++--- amf/public/include/core/AudioBuffer.h | 6 +++--- amf/public/include/core/Buffer.h | 6 +++--- amf/public/include/core/Compute.h | 6 +++--- amf/public/include/core/ComputeFactory.h | 7 ++++--- amf/public/include/core/Context.h | 6 +++--- amf/public/include/core/Data.h | 6 +++--- amf/public/include/core/Debug.h | 6 +++--- amf/public/include/core/Dump.h | 4 ++-- amf/public/include/core/Factory.h | 4 ++-- amf/public/include/core/Interface.h | 6 +++--- amf/public/include/core/Plane.h | 6 +++--- amf/public/include/core/Platform.h | 6 +++--- amf/public/include/core/PropertyStorage.h | 6 +++--- amf/public/include/core/PropertyStorageEx.h | 6 +++--- amf/public/include/core/Result.h | 6 +++--- amf/public/include/core/Surface.h | 6 +++--- amf/public/include/core/Trace.h | 6 +++--- amf/public/include/core/Variant.h | 6 +++--- amf/public/include/core/Version.h | 6 +++--- 34 files changed, 101 insertions(+), 100 deletions(-) diff --git a/amf/public/include/components/Ambisonic2SRenderer.h b/amf/public/include/components/Ambisonic2SRenderer.h index af9c882..46bc623 100644 --- a/amf/public/include/components/Ambisonic2SRenderer.h +++ b/amf/public/include/components/Ambisonic2SRenderer.h @@ -34,8 +34,8 @@ // interface declaration; Ambisonic to Stereo Renderer //------------------------------------------------------------------------------------------------- -#ifndef __AMFAmbisonic2SRendererHW__h__ -#define __AMFAmbisonic2SRendererHW__h__ +#ifndef AMF_Ambisonic2SRenderer_h +#define AMF_Ambisonic2SRenderer_h #pragma once #include "public/include/components/Component.h" @@ -76,4 +76,4 @@ extern "C" { AMF_RESULT AMF_CDECL_CALL AMFCreateComponentAmbisonic(amf::AMFContext* pContext, void* reserved, amf::AMFComponent** ppComponent); } -#endif //#ifndef __AMFAmbisonic2SRendererHW__h__ +#endif //#ifndef AMF_Ambisonic2SRenderer_h diff --git a/amf/public/include/components/AudioCapture.h b/amf/public/include/components/AudioCapture.h index 7db2230..abaa4ef 100644 --- a/amf/public/include/components/AudioCapture.h +++ b/amf/public/include/components/AudioCapture.h @@ -33,8 +33,8 @@ //------------------------------------------------------------------------------------------------- // Audio session interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFAudioCapture_h__ -#define __AMFAudioCapture_h__ +#ifndef AMF_AudioCapture_h +#define AMF_AudioCapture_h #pragma once @@ -81,4 +81,4 @@ extern "C" AMF_RESULT AMF_CDECL_CALL AMFCreateComponentAudioCapture(amf::AMFContext* pContext, amf::AMFComponent** ppComponent); } -#endif +#endif // #ifndef AMF_AudioCapture_h diff --git a/amf/public/include/components/Component.h b/amf/public/include/components/Component.h index 72ab7f5..d704451 100644 --- a/amf/public/include/components/Component.h +++ b/amf/public/include/components/Component.h @@ -36,8 +36,8 @@ * @brief AMFComponent interface declaration *************************************************************************************************** */ -#ifndef __AMFComponent_h__ -#define __AMFComponent_h__ +#ifndef AMF_Component_h +#define AMF_Component_h #pragma once #include "../core/Data.h" @@ -390,4 +390,4 @@ namespace amf } // namespace #endif -#endif //#ifndef __AMFComponent_h__ +#endif //#ifndef AMF_Component_h diff --git a/amf/public/include/components/ComponentCaps.h b/amf/public/include/components/ComponentCaps.h index 31daef5..659f90f 100644 --- a/amf/public/include/components/ComponentCaps.h +++ b/amf/public/include/components/ComponentCaps.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFComponentCaps_h__ -#define __AMFComponentCaps_h__ +#ifndef AMF_ComponentCaps_h +#define AMF_ComponentCaps_h #pragma once @@ -169,4 +169,4 @@ namespace amf } #endif -#endif //#ifndef __AMFComponentCaps_h__ +#endif //#ifndef AMF_ComponentCaps_h diff --git a/amf/public/include/components/DisplayCapture.h b/amf/public/include/components/DisplayCapture.h index f739ae6..b7b6074 100644 --- a/amf/public/include/components/DisplayCapture.h +++ b/amf/public/include/components/DisplayCapture.h @@ -34,8 +34,8 @@ // Desktop duplication interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFDISPLAYCAPTURE__ -#define __AMFDISPLAYCAPTURE__ +#ifndef AMF_DisplayCapture_h +#define AMF_DisplayCapture_h #pragma once #include "public/include/components/Component.h" @@ -64,4 +64,4 @@ extern "C" // AMF_RESULT AMF_CDECL_CALL AMFCreateComponentDisplayCapture(amf::AMFContext* pContext, amf::AMFComponent** ppComponent); } -#endif // #ifndef __AMFDISPLAYCAPTURE__ +#endif // #ifndef AMF_DisplayCapture_h diff --git a/amf/public/include/components/FFMPEGAudioConverter.h b/amf/public/include/components/FFMPEGAudioConverter.h index 8fdb400..9108cfa 100644 --- a/amf/public/include/components/FFMPEGAudioConverter.h +++ b/amf/public/include/components/FFMPEGAudioConverter.h @@ -34,8 +34,8 @@ // AMFFAudioConverterFFMPEG interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFAudioConverterFFMPEG_h__ -#define __AMFAudioConverterFFMPEG_h__ +#ifndef AMF_AudioConverterFFMPEG_h +#define AMF_AudioConverterFFMPEG_h #pragma once @@ -59,4 +59,4 @@ -#endif //#ifndef __AMFAudioConverterFFMPEG_h__ +#endif //#ifndef AMF_AudioConverterFFMPEG_h diff --git a/amf/public/include/components/FFMPEGAudioDecoder.h b/amf/public/include/components/FFMPEGAudioDecoder.h index d786c19..f916636 100644 --- a/amf/public/include/components/FFMPEGAudioDecoder.h +++ b/amf/public/include/components/FFMPEGAudioDecoder.h @@ -33,8 +33,8 @@ //------------------------------------------------------------------------------------------------- // AudioDecoderFFMPEG interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFAudioDecoderFFMPEG_h__ -#define __AMFAudioDecoderFFMPEG_h__ +#ifndef AMF_AudioDecoderFFMPEG_h +#define AMF_AudioDecoderFFMPEG_h #pragma once @@ -65,4 +65,4 @@ -#endif //#ifndef __AMFAudioDecoderFFMPEG_h__ +#endif //#ifndef AMF_AudioDecoderFFMPEG_h diff --git a/amf/public/include/components/FFMPEGAudioEncoder.h b/amf/public/include/components/FFMPEGAudioEncoder.h index 5ff168c..a3ccc3f 100644 --- a/amf/public/include/components/FFMPEGAudioEncoder.h +++ b/amf/public/include/components/FFMPEGAudioEncoder.h @@ -33,8 +33,8 @@ //------------------------------------------------------------------------------------------------- // AudioEncoderFFMPEG interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFAudioEncoderFFMPEG_h__ -#define __AMFAudioEncoderFFMPEG_h__ +#ifndef AMF_AudioEncoderFFMPEG_h +#define AMF_AudioEncoderFFMPEG_h #pragma once @@ -63,4 +63,4 @@ -#endif //#ifndef __AMFAudioEncoderFFMPEG_h__ +#endif //#ifndef AMF_AudioEncoderFFMPEG_h diff --git a/amf/public/include/components/FFMPEGComponents.h b/amf/public/include/components/FFMPEGComponents.h index f6af7d7..6679de9 100644 --- a/amf/public/include/components/FFMPEGComponents.h +++ b/amf/public/include/components/FFMPEGComponents.h @@ -34,8 +34,8 @@ // FFMPEG components definitions //------------------------------------------------------------------------------------------------- -#ifndef __AMFComponentsFFMPEG_h__ -#define __AMFComponentsFFMPEG_h__ +#ifndef AMF_ComponentsFFMPEG_h +#define AMF_ComponentsFFMPEG_h #pragma once @@ -47,4 +47,4 @@ #endif -#endif //#ifndef __AMFComponentsFFMPEG_h__ +#endif //#ifndef AMF_ComponentsFFMPEG_h diff --git a/amf/public/include/components/FFMPEGFileDemuxer.h b/amf/public/include/components/FFMPEGFileDemuxer.h index 7e2591a..541bdce 100644 --- a/amf/public/include/components/FFMPEGFileDemuxer.h +++ b/amf/public/include/components/FFMPEGFileDemuxer.h @@ -33,8 +33,8 @@ //------------------------------------------------------------------------------------------------- // DemuxerFFMPEG interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFFileDemuxerFFMPEG_h__ -#define __AMFFileDemuxerFFMPEG_h__ +#ifndef AMF_FileDemuxerFFMPEG_h +#define AMF_FileDemuxerFFMPEG_h #pragma once @@ -85,4 +85,4 @@ enum FFMPEG_DEMUXER_STREAM_TYPE_ENUM // buffer properties #define FFMPEG_DEMUXER_BUFFER_TYPE L"BufferType" // amf_int64 ( FFMPEG_DEMUXER_STREAM_TYPE_ENUM ) #define FFMPEG_DEMUXER_BUFFER_STREAM_INDEX L"BufferStreamIndexType" // amf_int64 ( stream index ) -#endif //#ifndef __AMFFileDemuxerFFMPEG_h__ +#endif //#ifndef AMF_FileDemuxerFFMPEG_h diff --git a/amf/public/include/components/FFMPEGFileMuxer.h b/amf/public/include/components/FFMPEGFileMuxer.h index eff516c..5eac491 100644 --- a/amf/public/include/components/FFMPEGFileMuxer.h +++ b/amf/public/include/components/FFMPEGFileMuxer.h @@ -33,8 +33,8 @@ //------------------------------------------------------------------------------------------------- // MuxerFFMPEG interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFFileMuxerFFMPEG_h__ -#define __AMFFileMuxerFFMPEG_h__ +#ifndef AMF_FileMuxerFFMPEG_h +#define AMF_FileMuxerFFMPEG_h #pragma once @@ -77,4 +77,4 @@ enum FFMPEG_MUXER_STREAM_TYPE_ENUM -#endif //#ifndef __AMFFileMuxerFFMPEG_h__ +#endif //#ifndef AMF_FileMuxerFFMPEG_h diff --git a/amf/public/include/components/MediaSource.h b/amf/public/include/components/MediaSource.h index c6af342..1a26999 100644 --- a/amf/public/include/components/MediaSource.h +++ b/amf/public/include/components/MediaSource.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFMediaSource_h__ -#define __AMFMediaSource_h__ +#ifndef AMF_MediaSource_h +#define AMF_MediaSource_h #pragma once @@ -76,4 +76,4 @@ namespace amf typedef AMFInterfacePtr_T<AMFMediaSource> AMFMediaSourcePtr; } //namespace amf -#endif //#ifndef __AMFMediaSource_h__ +#endif //#ifndef AMF_MediaSource_h diff --git a/amf/public/include/components/VideoConverter.h b/amf/public/include/components/VideoConverter.h index 78aa97f..fd0aa56 100644 --- a/amf/public/include/components/VideoConverter.h +++ b/amf/public/include/components/VideoConverter.h @@ -33,8 +33,8 @@ //------------------------------------------------------------------------------------------------- // AMFFVideoConverter interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFVideoConverter_h__ -#define __AMFVideoConverter_h__ +#ifndef AMF_VideoConverter_h +#define AMF_VideoConverter_h #pragma once #include "Component.h" @@ -84,4 +84,4 @@ enum AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM #define AMF_VIDEO_CONVERTER_LINEAR_RGB L"LinearRGB" // bool (default=false) Convert to/from linear RGB instead of sRGB -#endif //#ifndef __AMFVideoConverter_h__ +#endif //#ifndef AMF_VideoConverter_h diff --git a/amf/public/include/components/VideoEncoderHEVC.h b/amf/public/include/components/VideoEncoderHEVC.h index 7df85ba..a3302e1 100644 --- a/amf/public/include/components/VideoEncoderHEVC.h +++ b/amf/public/include/components/VideoEncoderHEVC.h @@ -24,8 +24,8 @@ // VideoEncoderHW_HEVC interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFVideoEncoderHW_HEVC_h__ -#define __AMFVideoEncoderHW_HEVC_h__ +#ifndef AMF_VideoEncoderHW_HEVC_h +#define AMF_VideoEncoderHW_HEVC_h #pragma once #include "Component.h" @@ -187,4 +187,4 @@ enum AMF_VIDEO_ENCODER_HEVC_HEADER_INSERTION_MODE_ENUM #define AMF_VIDEO_ENCODER_HEVC_CAP_MAX_REFERENCE_FRAMES L"HevcMaxReferenceFrames" // amf_int64 maximum number of reference frames -#endif //#ifndef __AMFVideoEncoderHW_HEVC_h__ +#endif //#ifndef AMF_VideoEncoderHW_HEVC_h diff --git a/amf/public/include/components/VideoEncoderVCE.h b/amf/public/include/components/VideoEncoderVCE.h index 523ea57..407e4b4 100644 --- a/amf/public/include/components/VideoEncoderVCE.h +++ b/amf/public/include/components/VideoEncoderVCE.h @@ -34,8 +34,8 @@ // AMFVideoEncoderHW_AVC interface declaration //------------------------------------------------------------------------------------------------- -#ifndef __AMFVideoEncoderHW_AVC_h__ -#define __AMFVideoEncoderHW_AVC_h__ +#ifndef AMF_VideoEncoderHW_AVC_h +#define AMF_VideoEncoderHW_AVC_h #pragma once #include "Component.h" @@ -223,4 +223,4 @@ enum AMF_VIDEO_ENCODER_CODING_ENUM #define AMF_VIDEO_ENCODER_CAP_FIXED_SLICE_MODE L"FixedSliceMode" // bool is fixed slice mode supported #define AMF_VIDEO_ENCODER_CAP_NUM_OF_HW_INSTANCES L"NumOfHwInstances" // amf_int64 number of HW encoder instances -#endif //#ifndef __AMFVideoEncoderHW_AVC_h__ +#endif //#ifndef AMF_VideoEncoderHW_AVC_h diff --git a/amf/public/include/core/AudioBuffer.h b/amf/public/include/core/AudioBuffer.h index 5b7fe1a..3265802 100644 --- a/amf/public/include/core/AudioBuffer.h +++ b/amf/public/include/core/AudioBuffer.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFAudioBuffer_h__ -#define __AMFAudioBuffer_h__ +#ifndef AMF_AudioBuffer_h +#define AMF_AudioBuffer_h #pragma once #include "Data.h" @@ -181,4 +181,4 @@ namespace amf #if defined(_MSC_VER) #pragma warning( pop ) #endif -#endif //#ifndef __AMFAudioBuffer_h__ +#endif //#ifndef AMF_AudioBuffer_h diff --git a/amf/public/include/core/Buffer.h b/amf/public/include/core/Buffer.h index 7973b54..9007645 100644 --- a/amf/public/include/core/Buffer.h +++ b/amf/public/include/core/Buffer.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFBuffer_h__ -#define __AMFBuffer_h__ +#ifndef AMF_Buffer_h +#define AMF_Buffer_h #pragma once #include "Data.h" @@ -157,4 +157,4 @@ namespace amf #if defined(_MSC_VER) #pragma warning( pop ) #endif -#endif //#ifndef __AMFBuffer_h__ +#endif //#ifndef AMF_Buffer_h diff --git a/amf/public/include/core/Compute.h b/amf/public/include/core/Compute.h index b829312..089316b 100644 --- a/amf/public/include/core/Compute.h +++ b/amf/public/include/core/Compute.h @@ -36,8 +36,8 @@ * @brief AMFCompute interface declaration *************************************************************************************************** */ -#ifndef __AMFCompute_h__ -#define __AMFCompute_h__ +#ifndef AMF_Compute_h +#define AMF_Compute_h #pragma once #include "Buffer.h" @@ -298,4 +298,4 @@ namespace amf } // namespace amf #endif -#endif // __AMFCompute_h__ \ No newline at end of file +#endif // AMF_Compute_h diff --git a/amf/public/include/core/ComputeFactory.h b/amf/public/include/core/ComputeFactory.h index 29e2d1b..54a7e57 100644 --- a/amf/public/include/core/ComputeFactory.h +++ b/amf/public/include/core/ComputeFactory.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFComputeCaps_h__ -#define __AMFComputeCaps_h__ +#ifndef AMF_ComputeFactory_h +#define AMF_ComputeFactory_h #pragma once #include "Compute.h" @@ -143,4 +143,5 @@ namespace amf #if defined(__cplusplus) }; // namespace amf #endif -#endif // __AMFComputeCaps_h__ \ No newline at end of file + +#endif // AMF_ComputeFactory_h diff --git a/amf/public/include/core/Context.h b/amf/public/include/core/Context.h index d2286eb..07aaa42 100644 --- a/amf/public/include/core/Context.h +++ b/amf/public/include/core/Context.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFContext_h__ -#define __AMFContext_h__ +#ifndef AMF_Context_h +#define AMF_Context_h #pragma once #include "Buffer.h" @@ -439,4 +439,4 @@ enum AMF_CONTEXT_DEVICETYPE_ENUM AMF_CONTEXT_DEVICE_TYPE_CPU }; #define AMF_CONTEXT_DEVICE_TYPE L"AMF_Context_DeviceType" //Value type: amf_int64; Values : AMF_CONTEXT_DEVICE_TYPE_GPU for GPU (default) , AMF_CONTEXT_DEVICE_TYPE_CPU for CPU. -#endif //#ifndef __AMFContext_h__ +#endif //#ifndef AMF_Context_h diff --git a/amf/public/include/core/Data.h b/amf/public/include/core/Data.h index 83376a9..dbe2175 100644 --- a/amf/public/include/core/Data.h +++ b/amf/public/include/core/Data.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFData_h__ -#define __AMFData_h__ +#ifndef AMF_Data_h +#define AMF_Data_h #pragma once #include "PropertyStorage.h" @@ -156,4 +156,4 @@ namespace amf } // namespace #endif -#endif //#ifndef __AMFData_h__ +#endif //#ifndef AMF_Data_h diff --git a/amf/public/include/core/Debug.h b/amf/public/include/core/Debug.h index f9cff82..96f535e 100644 --- a/amf/public/include/core/Debug.h +++ b/amf/public/include/core/Debug.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFDebug_h__ -#define __AMFDebug_h__ +#ifndef AMF_Debug_h +#define AMF_Debug_h #pragma once #include "Platform.h" @@ -75,4 +75,4 @@ namespace amf } #endif -#endif // __AMFDebug_h__ +#endif // AMF_Debug_h diff --git a/amf/public/include/core/Dump.h b/amf/public/include/core/Dump.h index ec6b6aa..8bb7430 100644 --- a/amf/public/include/core/Dump.h +++ b/amf/public/include/core/Dump.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFDump_h__ -#define __AMFDump_h__ +#ifndef AMF_Dump_h +#define AMF_Dump_h #pragma once #include "Platform.h" diff --git a/amf/public/include/core/Factory.h b/amf/public/include/core/Factory.h index efc0a64..60ca9fc 100644 --- a/amf/public/include/core/Factory.h +++ b/amf/public/include/core/Factory.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFFactory_h__ -#define __AMFFactory_h__ +#ifndef AMF_Factory_h +#define AMF_Factory_h #pragma once #include "Platform.h" diff --git a/amf/public/include/core/Interface.h b/amf/public/include/core/Interface.h index 4976026..ee83a56 100644 --- a/amf/public/include/core/Interface.h +++ b/amf/public/include/core/Interface.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFInterface_h__ -#define __AMFInterface_h__ +#ifndef AMF_Interface_h +#define AMF_Interface_h #pragma once #include "Result.h" @@ -255,4 +255,4 @@ namespace amf } #endif -#endif //#ifndef __AMFInterface_h__ +#endif //#ifndef AMF_Interface_h diff --git a/amf/public/include/core/Plane.h b/amf/public/include/core/Plane.h index d993cf8..ed82ea7 100644 --- a/amf/public/include/core/Plane.h +++ b/amf/public/include/core/Plane.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFPlane_h__ -#define __AMFPlane_h__ +#ifndef AMF_Plane_h +#define AMF_Plane_h #pragma once #include "Interface.h" @@ -109,4 +109,4 @@ namespace amf } // namespace amf #endif -#endif //#ifndef __AMFPlane_h__ +#endif //#ifndef AMF_Plane_h diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h index 6543cdb..8463d5a 100644 --- a/amf/public/include/core/Platform.h +++ b/amf/public/include/core/Platform.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFPlatform_h__ -#define __AMFPlatform_h__ +#ifndef AMF_Platform_h +#define AMF_Platform_h #pragma once //---------------------------------------------------------------------------------------------- @@ -435,4 +435,4 @@ namespace amf } #endif -#endif //#ifndef __AMFPlatform_h__ +#endif //#ifndef AMF_Platform_h diff --git a/amf/public/include/core/PropertyStorage.h b/amf/public/include/core/PropertyStorage.h index 6370845..dd96a6d 100644 --- a/amf/public/include/core/PropertyStorage.h +++ b/amf/public/include/core/PropertyStorage.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFPropertyStorage_h__ -#define __AMFPropertyStorage_h__ +#ifndef AMF_PropertyStorage_h +#define AMF_PropertyStorage_h #pragma once #include "Variant.h" @@ -222,4 +222,4 @@ namespace amf } //namespace amf #endif -#endif // #ifndef __AMFPropertyStorage_h__ +#endif // #ifndef AMF_PropertyStorage_h diff --git a/amf/public/include/core/PropertyStorageEx.h b/amf/public/include/core/PropertyStorageEx.h index e3872d2..2799d2a 100644 --- a/amf/public/include/core/PropertyStorageEx.h +++ b/amf/public/include/core/PropertyStorageEx.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFPropertyStorageEx_h__ -#define __AMFPropertyStorageEx_h__ +#ifndef AMF_PropertyStorageEx_h +#define AMF_PropertyStorageEx_h #pragma once #include "PropertyStorage.h" @@ -194,4 +194,4 @@ namespace amf #endif -#endif //#ifndef __AMFPropertyStorageEx_h__ +#endif //#ifndef AMF_PropertyStorageEx_h diff --git a/amf/public/include/core/Result.h b/amf/public/include/core/Result.h index 3967aa9..a6a0888 100644 --- a/amf/public/include/core/Result.h +++ b/amf/public/include/core/Result.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFResult_h__ -#define __AMFResult_h__ +#ifndef AMF_Result_h +#define AMF_Result_h #pragma once #include "Platform.h" @@ -124,4 +124,4 @@ typedef enum AMF_RESULT AMF_NEED_MORE_INPUT ,//returned by AMFComponent::SubmitInput did not produce buffer } AMF_RESULT; -#endif //#ifndef __AMFResult_h__ +#endif //#ifndef AMF_Result_h diff --git a/amf/public/include/core/Surface.h b/amf/public/include/core/Surface.h index e7a6fd5..6faf51a 100644 --- a/amf/public/include/core/Surface.h +++ b/amf/public/include/core/Surface.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFSurface_h__ -#define __AMFSurface_h__ +#ifndef AMF_Surface_h +#define AMF_Surface_h #pragma once #include "Data.h" @@ -229,4 +229,4 @@ namespace amf #if defined(_MSC_VER) #pragma warning( pop ) #endif -#endif //#ifndef __AMFSurface_h__ +#endif //#ifndef AMF_Surface_h diff --git a/amf/public/include/core/Trace.h b/amf/public/include/core/Trace.h index 00d081a..f766339 100644 --- a/amf/public/include/core/Trace.h +++ b/amf/public/include/core/Trace.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFTrace_h__ -#define __AMFTrace_h__ +#ifndef AMF_Trace_h +#define AMF_Trace_h #pragma once #include "Platform.h" @@ -180,4 +180,4 @@ namespace amf #endif -#endif // __AMFTrace_h__ +#endif // AMF_Trace_h diff --git a/amf/public/include/core/Variant.h b/amf/public/include/core/Variant.h index 10ade4c..e635655 100644 --- a/amf/public/include/core/Variant.h +++ b/amf/public/include/core/Variant.h @@ -30,8 +30,8 @@ // THE SOFTWARE. // -#ifndef __AMFVariant_h__ -#define __AMFVariant_h__ +#ifndef AMF_Variant_h +#define AMF_Variant_h #pragma once #if defined(_MSC_VER) #pragma warning(disable: 4996) @@ -1704,4 +1704,4 @@ namespace amf } //namespace amf #endif -#endif //#ifndef __AMFVariant_h__ +#endif //#ifndef AMF_Variant_h diff --git a/amf/public/include/core/Version.h b/amf/public/include/core/Version.h index b57d324..43c3eed 100644 --- a/amf/public/include/core/Version.h +++ b/amf/public/include/core/Version.h @@ -36,8 +36,8 @@ * @brief Version declaration *************************************************************************************************** */ -#ifndef __AMFVersion_h__ -#define __AMFVersion_h__ +#ifndef AMF_Version_h +#define AMF_Version_h #pragma once #include "Platform.h" @@ -56,4 +56,4 @@ #define AMF_FULL_VERSION AMF_MAKE_FULL_VERSION(AMF_VERSION_MAJOR, AMF_VERSION_MINOR, AMF_VERSION_RELEASE, AMF_VERSION_BUILD_NUM) -#endif //#ifndef __AMFVersion_h__ +#endif //#ifndef AMF_Version_h -- 2.11.0
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
