libical-1.0HEADlibical-1.0master

1 files changed, 5 insertions, 4 deletions

diff --git a/src/libical/icalderivedproperty.c.in b/src/libical/icalderivedproperty.c.in
index b4f29f1..f74c6f0 100644
--- a/src/libical/icalderivedproperty.c.in
+++ b/src/libical/icalderivedproperty.c.in
@@ -43,9 +43,9 @@
 #include <errno.h>
 #include <stdio.h> /* for printf */
 #include <stdarg.h> /* for va_list, va_start, etc. */
-                                               
-#ifdef WIN32
-#define strcasecmp      stricmp
+
+#ifdef _MSC_VER
+#define strcasecmp stricmp
 #endif
 
 struct icalproperty_impl*
@@ -192,7 +192,8 @@ int icalproperty_kind_and_string_to_enum(const int kind, const char* str)
 	    return 0;
 
     for (; i != ICALPROPERTY_LAST_ENUM; i++) {
-	if ( strcasecmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) {
+	if(enum_map[i-ICALPROPERTY_FIRST_ENUM].prop == pkind &&
+           strcasecmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) {
 	    return enum_map[i-ICALPROPERTY_FIRST_ENUM].prop_enum;
 	}
     }