Merge pull request #44 from iMobs/arm_compilation

ARM Compilation

Merge pull request #44 from iMobs/arm_compilation
ARM Compilation
4d06882c · Max Bruckner · GitHub · b355733a · d4836eff · 4d06882c
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

Makefile Makefile +1 -1

cJSON.c cJSON.c +1 -1

未找到文件。
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ $(DYLIBNAME): $(OBJ)
 		$(DYLIBCMD) $< $(LDFLAGS)
 	
 $(STLIBNAME): $(OBJ)
-		ar rcs $@ $<
+		$(AR) rcs $@ $<

 $(OBJ): cJSON.c cJSON.h 


--- a/cJSON.c
+++ b/cJSON.c
@@ -50,7 +50,7 @@ static int cJSON_strcasecmp(const char *s1, const char *s2)
    {
        return 1;
    }
-    for(; tolower(*s1) == tolower(*s2); ++s1, ++s2)
+    for(; tolower(*(const unsigned char *)s1) == tolower(*(const unsigned char *)s2); ++s1, ++s2)
    {
        if (*s1 == 0)
        {