shithub: openh264

Download patch

ref: 109fecc5477ef9128daeea396c59f1bab5305294
parent: 98dd2d91d9cfcc3096743da56a7ef72f4abb5919
author: Martin Storsjö <martin@martin.st>
date: Thu Jan 23 14:17:22 EST 2014 

Consistently use inline instead of __inline


--- a/codec/common/crt_util_safe_x.h
+++ b/codec/common/crt_util_safe_x.h
@@ -120,7 +120,7 @@
 
 #if (defined(WIN32) && defined(_MSC_VER) && (_MSC_VER<1500)) || defined(__GNUC__)
 
-static __inline int wels_strncpy_s (char* dest, int dmax, const char* src, int slen) {
+static inline int wels_strncpy_s (char* dest, int dmax, const char* src, int slen) {
 int orig_dmax;
 char* orig_dest;
 const char* overlap_bumper;
@@ -260,7 +260,7 @@
 return (ESNOSPC);
 }
 
-static __inline int wels_strcat_s (char* dest, int dmax, const char* src) {
+static inline int wels_strcat_s (char* dest, int dmax, const char* src) {
   int orig_dmax;
   char* orig_dest;
   const char* overlap_bumper;
@@ -387,7 +387,7 @@
   return (ESNOSPC);
 }
 
-static __inline int wels_strnlen_s (const char* dest, int dmax) {
+static inline int wels_strnlen_s (const char* dest, int dmax) {
   int count;
 
   if (dest == NULL) {
--- a/codec/common/macros.h
+++ b/codec/common/macros.h
@@ -131,7 +131,7 @@
 	nC += (uint8_t)(nA == -1 && nB == -1);           \
 }
 
-static __inline int32_t CeilLog2 (int32_t i) {
+static inline int32_t CeilLog2 (int32_t i) {
 int32_t s = 0;
 i--;
 while (i > 0) {