diff --git a/webrtc/modules/audio_coding/codecs/cng/test/StdAfx.h b/webrtc/modules/audio_coding/codecs/cng/test/StdAfx.h index dd6c4450b..c29d63897 100644 --- a/webrtc/modules/audio_coding/codecs/cng/test/StdAfx.h +++ b/webrtc/modules/audio_coding/codecs/cng/test/StdAfx.h @@ -16,10 +16,6 @@ #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_TEST_STDAFX_H_ #define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_TEST_STDAFX_H_ -#if _MSC_VER > 1000 -#pragma once -#endif // _MSC_VER > 1000 - #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include diff --git a/webrtc/modules/audio_device/win/audio_device_core_win.h b/webrtc/modules/audio_device/win/audio_device_core_win.h index 24a136fc4..b1efec42c 100644 --- a/webrtc/modules/audio_device/win/audio_device_core_win.h +++ b/webrtc/modules/audio_device/win/audio_device_core_win.h @@ -8,14 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H -#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H +#ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ +#define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ #if (_MSC_VER >= 1400) // only include for VS 2005 and higher #include "audio_device_generic.h" -#pragma once #include // CLSID_CWMAudioAEC // (must be before audioclient.h) #include // WASAPI @@ -380,5 +379,4 @@ private: } // namespace webrtc -#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H - +#endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ diff --git a/webrtc/test/channel_transport/udp_socket2_manager_win.h b/webrtc/test/channel_transport/udp_socket2_manager_win.h index 758c339b8..0eef997fd 100644 --- a/webrtc/test/channel_transport/udp_socket2_manager_win.h +++ b/webrtc/test/channel_transport/udp_socket2_manager_win.h @@ -11,10 +11,6 @@ #ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_ #define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_SOCKET2_MANAGER_WINDOWS_H_ -#if _MSC_VER > 1000 -#pragma once -#endif - #include #include "webrtc/system_wrappers/interface/atomic32.h" diff --git a/webrtc/test/testsupport/gtest_prod_util.h b/webrtc/test/testsupport/gtest_prod_util.h index 989d94d02..537058989 100644 --- a/webrtc/test/testsupport/gtest_prod_util.h +++ b/webrtc/test/testsupport/gtest_prod_util.h @@ -10,7 +10,6 @@ #ifndef WEBRTC_TEST_TESTSUPPORT_GTEST_PROD_UTIL_H_ #define WEBRTC_TEST_TESTSUPPORT_GTEST_PROD_UTIL_H_ -#pragma once // Define our own version of FRIEND_TEST here rather than including // gtest_prod.h to avoid depending on any part of GTest in production code. diff --git a/webrtc/voice_engine/dtmf_inband.h b/webrtc/voice_engine/dtmf_inband.h index 84f83a3ef..c867143c7 100644 --- a/webrtc/voice_engine/dtmf_inband.h +++ b/webrtc/voice_engine/dtmf_inband.h @@ -8,12 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H -#define WEBRTC_VOICE_ENGINE_DTMF_INBAND_H - -#if _MSC_VER > 1000 -#pragma once -#endif +#ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H_ +#define WEBRTC_VOICE_ENGINE_DTMF_INBAND_H_ #include "webrtc/typedefs.h" #include "webrtc/voice_engine/voice_engine_defines.h" @@ -88,4 +84,4 @@ private: } // namespace webrtc -#endif // #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H +#endif // #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_H_ diff --git a/webrtc/voice_engine/test/win_test/WinTest.h b/webrtc/voice_engine/test/win_test/WinTest.h index d012ce6e4..7320360e4 100644 --- a/webrtc/voice_engine/test/win_test/WinTest.h +++ b/webrtc/voice_engine/test/win_test/WinTest.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ - -#pragma once +#ifndef WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTEST_H_ +#define WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTEST_H_ #ifndef __AFXWIN_H__ #error "include 'stdafx.h' before including this file for PCH" @@ -36,3 +36,5 @@ public: }; extern CWinTestApp theApp; + +#endif // WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTEST_H_ diff --git a/webrtc/voice_engine/test/win_test/WinTestDlg.h b/webrtc/voice_engine/test/win_test/WinTestDlg.h index 5c7f5b6cb..65dcf3842 100644 --- a/webrtc/voice_engine/test/win_test/WinTestDlg.h +++ b/webrtc/voice_engine/test/win_test/WinTestDlg.h @@ -7,8 +7,8 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ - -#pragma once +#ifndef WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTESTDLG_H_ +#define WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTESTDLG_H_ #if (_MSC_VER >= 1400) #define PRINT_GET_RESULT(...) \ @@ -278,4 +278,5 @@ public: afx_msg void OnBnClickedButtonClearErrorCallback(); afx_msg void OnBnClickedCheckBwe1(); }; -#pragma once + +#endif // WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_WINTESTDLG_H_ diff --git a/webrtc/voice_engine/test/win_test/stdafx.h b/webrtc/voice_engine/test/win_test/stdafx.h index b4d875c6d..17b3c30ea 100644 --- a/webrtc/voice_engine/test/win_test/stdafx.h +++ b/webrtc/voice_engine/test/win_test/stdafx.h @@ -8,12 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ +#ifndef WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_STDAFX_H_ +#define WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_STDAFX_H_ + // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, // but are changed infrequently -#pragma once - #ifndef _SECURE_ATL #define _SECURE_ATL 1 #endif @@ -48,10 +49,6 @@ #include // MFC core and standard components #include // MFC extensions - - - - #ifndef _AFX_NO_OLE_SUPPORT #include // MFC support for Internet Explorer 4 Common Controls #endif @@ -59,14 +56,6 @@ #include // MFC support for Windows Common Controls #endif // _AFX_NO_AFXCMN_SUPPORT - - - - - - - - #ifdef _UNICODE #if defined _M_IX86 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"") @@ -79,4 +68,4 @@ #endif #endif - +#endif // WEBRTC_VOICE_ENGINE_TEST_WIN_TEST_STDAFX_H_