For PR9480:

--- Merging r127283 into '.':
U    tools/libclang/CIndexer.cpp

--- Merging r127308 into '.':
U    tools/c-index-test/c-index-test.c

llvm-svn: 127633

Author: isanbard

clang/tools/c-index-test/c-index-test.c

@@ -990,7 +990,7 @@ void print_completion_result(CXCompletionResult *completion_result,
 
 int my_stricmp(const char *s1, const char *s2) {
   while (*s1 && *s2) {
-    int c1 = tolower(*s1), c2 = tolower(*s2);
+    int c1 = tolower((unsigned char)*s1), c2 = tolower((unsigned char)*s2);
     if (c1 < c2)
       return -1;
     else if (c1 > c2)

clang/tools/libclang/CIndexer.cpp

@@ -32,6 +32,7 @@
 #include <sstream>
 
 #ifdef __CYGWIN__
+#include <cygwin/version.h>
 #include <sys/cygwin.h>
 #define LLVM_ON_WIN32 1
 #endif
@@ -60,7 +61,11 @@ std::string CIndexer::getClangResourcesPath() {
 #ifdef __CYGWIN__
   char w32path[MAX_PATH];
   strcpy(w32path, path);
+#if CYGWIN_VERSION_API_MAJOR > 0 || CYGWIN_VERSION_API_MINOR >= 181
+  cygwin_conv_path(CCP_WIN_A_TO_POSIX, w32path, path, MAX_PATH);
+#else
   cygwin_conv_to_full_posix_path(w32path, path);
+#endif
 #endif
 
   llvm::sys::Path LibClangPath(path);