From c768fc3acca4394dbb6e1ab248f7ccd02a1c0a8c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 26 May 2014 14:35:26 +0000
Subject: gcc-related fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@9318 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 include/m_system.h     | 9 +++++----
 include/m_system_cpp.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/m_system.h b/include/m_system.h
index d330108e43..c8e48e1df4 100644
--- a/include/m_system.h
+++ b/include/m_system.h
@@ -40,10 +40,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #ifndef _MSC_VER
-	#ifndef FORCEINLINE
-		#define FORCEINLINE __inline
-	#endif
-	#define __forceinline static FORCEINLINE
+//	#ifndef FORCEINLINE
+//		#define FORCEINLINE __inline
+//	#endif
+//	#define __forceinline static FORCEINLINE
+	#define __forceinline inline __attribute__ ((always_inline))
 #else
 	#pragma warning(disable:4244 4245)
 #endif
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index 4bddd0ae27..fa2a13b4b0 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -182,7 +182,7 @@ template<class T> struct OBJLIST : public LIST<T>
 
 	__inline OBJLIST(const OBJLIST& x) :
 		LIST<T>(x.increment, x.sortFunc)
-		{	items = NULL;
+		{	this->items = NULL;
 			List_ObjCopy((SortedList*)&x, (SortedList*)this, sizeof(T));
 		}
 
-- 
cgit v1.2.3