shithub: openh264

Download patch

ref: 16ad879dafe9177cce30dd85c348297173584818
parent: dba62070bf64f6f1ec2729563df183898e0eef19
parent: b1c070cf8bddbeca4d1b652749cb15e7b0f835b2
author: ekr <ekr@rtfm.com>
date: Sun Jan 5 02:46:15 EST 2014

Merge pull request #102 from mstorsjo/remove-pragma-once

Remove pragma once

--- a/codec/api/svc/codec_def.h
+++ b/codec/api/svc/codec_def.h
@@ -33,10 +33,6 @@
 #ifndef WELS_VIDEO_CODEC_DEFINITION_H__
 #define WELS_VIDEO_CODEC_DEFINITION_H__
 
-#if defined(WIN32)
-#pragma once
-#endif//WIN32
-
 typedef enum {
   /*rgb color formats*/
   videoFormatRGB        = 1,
--- a/codec/console/dec/inc/d3d9_utils.h
+++ b/codec/console/dec/inc/d3d9_utils.h
@@ -43,8 +43,6 @@
 #ifndef WELS_D3D9_UTILS_H__
 #define WELS_D3D9_UTILS_H__
 
-//#pragma once	// do not use this due cross platform, esp for Solaris
-
 #include <stdio.h>
 #include "codec_def.h"
 
--- a/codec/console/dec/inc/dec_console.h
+++ b/codec/console/dec/inc/dec_console.h
@@ -34,8 +34,10 @@
  *  Created on 11-3-15.
  *
  */
-#pragma once
 
+#ifndef DEC_CONSOLE_H__
+#define DEC_CONSOLE_H__
+
 #include "code_api.h"
 
 /////////////////////////////////////////////////////////////////////////////////////
@@ -51,3 +53,4 @@
 
 
 
+#endif  // DEC_CONSOLE_H__
--- a/codec/decoder/plus/inc/StdAfx.h
+++ b/codec/decoder/plus/inc/StdAfx.h
@@ -38,10 +38,6 @@
 #if !defined(AFX_STDAFX_H__695FA8A5_BDC4_4206_8B7D_EE290F91E766__INCLUDED_)
 #define AFX_STDAFX_H__695FA8A5_BDC4_4206_8B7D_EE290F91E766__INCLUDED_
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 
 // Insert your headers here
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
--- a/codec/decoder/plus/inc/welsDecoderExt.h
+++ b/codec/decoder/plus/inc/welsDecoderExt.h
@@ -47,10 +47,6 @@
 #include "decoder_context.h"
 #include "welsCodecTrace.h"
 
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
 
 class ISVCDecoder;