Fix for __debugbreak and unsigned integer comparation.

rhcad · Oct 22, 2015 · cca3f75 · cca3f75
1 parent d5bb7b7
commit cca3f75
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,11 @@ obj
 *.opt
 *.suo
 *.user
+*.obj
+*.aps
+*.*sdf
+ipch
+.idea/
+build
+*.tmp
+*~
diff --git a/code/pkg_Core/Interface/Log/DebugR.h b/code/pkg_Core/Interface/Log/DebugR.h
@@ -8,12 +8,16 @@
 
 int x3CrtDbgReport(const char* file, long line, const char* msg);
 
-#if !defined(__MINGW_INTRIN_INLINE) && defined(_WIN32)
-#ifndef _MSC_VER
-inline void __debugbreak() {}
-#elif _MSC_VER <= 1200 // VC6
-#define __debugbreak DebugBreak
-#endif
+#if !defined(__MINGW_INTRIN_INLINE)
+    #ifdef _WIN32
+        #ifndef _MSC_VER
+            inline void __debugbreak() {}
+        #elif _MSC_VER <= 1200 // VC6
+            #define __debugbreak DebugBreak
+        #endif
+    #else
+        inline void __debugbreak() {}
+    #endif
 #endif
 
 #undef ASSERT

diff --git a/code/pkg_Core/Modules/TextUtility/md5.cpp b/code/pkg_Core/Modules/TextUtility/md5.cpp
@@ -306,13 +306,13 @@ get the string add one.
  void CMD5::StringAddOne( char * orstring ) 
 { 
 	size_t len; 
-	size_t i,n; 
+	size_t n;
 
 	len = strlen(orstring); 
 	n = len - 1; 
-	for(i = n; i >= 0; i--) 
+	for(int i = (int)n; i >= 0; i--)
 	{ 
-		if(orstring[i]=='9') 
+		if(orstring[i]=='9')
 		{ 
 			orstring[i] = 'A'; 
 			break;