Ajustes para eliminar problemas que apareceram na atualização do gcc para windows.

Perry Werneck
1 parent e4ef72e3
Showing 1 changed file with 48 additions and 55 deletions Show diff stats
src/classlib/private.h
@@ -34,79 +34,72 @@
 	#include <cstring>
 	#include <pw3270/class.h>
-	#if __cplusplus < 201103L
+	#if defined(_WIN32)
-		#define nullptr	NULL
-
-
-		#ifdef _WIN32
-
-			class recursive_mutex {
-			private:
-				HANDLE hMutex;
+		class recursive_mutex {
+		private:
+			HANDLE hMutex;
-			public:
-				recursive_mutex() {
-					hMutex = CreateMutex(NULL,FALSE,NULL);
-				};
-
-				~recursive_mutex() {
-					CloseHandle(hMutex);
-				};
-
-				void lock(void) {
-					WaitForSingleObject(hMutex,INFINITE);
-				};
+		public:
+			recursive_mutex() {
+				hMutex = CreateMutex(NULL,FALSE,NULL);
+			};
-				void unlock(void) {
-					ReleaseMutex(hMutex);
-				};
+			~recursive_mutex() {
+				CloseHandle(hMutex);
+			};
-				bool try_lock(void) {
-					if(WaitForSingleObject(hMutex,1) == WAIT_OBJECT_0)
-						return true;
-					return false;
-				};
+			void lock(void) {
+				WaitForSingleObject(hMutex,INFINITE);
 			};
-		#else
+			void unlock(void) {
+				ReleaseMutex(hMutex);
+			};
-			class recursive_mutex {
-			private:
-				pthread_mutex_t           mtx;
-				pthread_mutexattr_t       mtxAttr;
+			bool try_lock(void) {
+				if(WaitForSingleObject(hMutex,1) == WAIT_OBJECT_0)
+					return true;
+				return false;
+			};
+		};
-			public:
-				recursive_mutex() {
+	#elif __cplusplus < 201103L
-					memset(&mtx,0,sizeof(mtx));
-					memset(&mtxAttr,0,sizeof(mtxAttr));
+		#define nullptr	NULL
-					pthread_mutexattr_init(&mtxAttr);
-					pthread_mutexattr_settype(&mtxAttr, PTHREAD_MUTEX_RECURSIVE);
-					pthread_mutex_init(&mtx, &mtxAttr);
-				};
+		class recursive_mutex {
+		private:
+			pthread_mutex_t           mtx;
+			pthread_mutexattr_t       mtxAttr;
-				~recursive_mutex() {
-					pthread_mutex_destroy(&mtx);
-				};
+		public:
+			recursive_mutex() {
-				void lock(void) {
-					pthread_mutex_lock(&mtx);
-				};
+				memset(&mtx,0,sizeof(mtx));
+				memset(&mtxAttr,0,sizeof(mtxAttr));
-				void unlock(void) {
-					pthread_mutex_unlock(&mtx);
-				};
+				pthread_mutexattr_init(&mtxAttr);
+				pthread_mutexattr_settype(&mtxAttr, PTHREAD_MUTEX_RECURSIVE);
+				pthread_mutex_init(&mtx, &mtxAttr);
+			};
-				bool try_lock(void) {
-					 return pthread_mutex_trylock(&mtx) == 0;
-				};
+			~recursive_mutex() {
+				pthread_mutex_destroy(&mtx);
 			};
+			void lock(void) {
+				pthread_mutex_lock(&mtx);
+			};
+			void unlock(void) {
+				pthread_mutex_unlock(&mtx);
+			};
-		#endif // _WIN32
+			bool try_lock(void) {
+				 return pthread_mutex_trylock(&mtx) == 0;
+			};
+		};
 	#else