Corrected bad Microsoft patch

blakemcbride · Dec 26, 2014 · 17df678 · 17df678
1 parent 3812235
commit 17df678
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Registry/regutil2.c b/Registry/regutil2.c
@@ -40,6 +40,13 @@ extern char *_fullpath();
 #include <direct.h>
 #include <stdlib.h>
 
+#ifdef _MSC_VER
+#if _MSC_VER >= 1400
+#define stricmp _stricmp
+#endif
+#endif
+
+
 
 void	RegStoreApplicationPath(char *company, char *product, char *version)
 {
@@ -66,7 +73,7 @@ void	RegStoreApplicationPath(char *company, char *product, char *version)
 	_getcwd(dir, _MAX_PATH);
 	for (i=0 ; ERROR_SUCCESS == RegEnumValue(h, i, name, &name_len, NULL, &type, data, &data_len) ; i++) {
 //		vPrintf(wind, "\"%s\" = \"%s\"\n", name, data);
-		if (!_stricmp(dir, data)) {
+		if (!stricmp(dir, data)) {
 			found = 1;
 			break;
 		}
@@ -108,7 +115,7 @@ void	RegStoreDataPath(char *company, char *product, char *version, char *path)
 	_fullpath(dir, path, _MAX_PATH);
 	for (i=0 ; ERROR_SUCCESS == RegEnumValue(h, i, name, &name_len, NULL, &type, data, &data_len) ; i++) {
 //		vPrintf(wind, "\"%s\" = \"%s\"\n", name, data);
-		if (!_stricmp(dir, data)) {
+		if (!stricmp(dir, data)) {
 			found = 1;
 			break;
 		}

diff --git a/threads/Thread.c b/threads/Thread.c
@@ -100,7 +100,7 @@ struct _priority_queue {
 #if !defined(unix) && !defined(__APPLE__) && !defined(PLAN9) && !defined(__minix) 
 #include <conio.h> 
 #ifdef _MSC_VER 
-#if _MSC_VER >= 800 
+#if _MSC_VER >= 1400 
 #define kbhit _kbhit 
 #define getch _getch 
 #endif 

diff --git a/threads/Thread.d b/threads/Thread.d
@@ -89,7 +89,7 @@ struct	_priority_queue  {
 #if	!defined(unix)  &&  !defined(__APPLE__)  &&  !defined(PLAN9)  &&  !defined(__minix)
 #include <conio.h>
 #ifdef _MSC_VER
-#if _MSC_VER >= 800
+#if _MSC_VER >= 1400
 #define kbhit _kbhit
 #define getch _getch
 #endif