[llvm-branch-commits] [cfe-branch] r127633 - in /cfe/branches/release_29: ./ test/SemaCXX/warn-unreachable.cpp tools/c-index-test/c-index-test.c tools/libclang/CIndexer.cpp

[Bill Wendling]

Author: void
Date: Mon Mar 14 18:08:03 2011
New Revision: 127633

URL: http://llvm.org/viewvc/llvm-project?rev=127633&view=rev
Log:
For PR9480:
--- Merging r127283 into '.':
U    tools/libclang/CIndexer.cpp

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

Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)
    cfe/branches/release_29/tools/c-index-test/c-index-test.c
    cfe/branches/release_29/tools/libclang/CIndexer.cpp

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 18:08:03 2011
@@ -1,2 +1,2 @@
-/cfe/trunk:127460,127541,127543,127563
+/cfe/trunk:127283,127308,127460,127541,127543,127563
 /cfe/trunk/test/SemaTemplate:126920

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 14 18:08:03 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127460,127541,127543,127563
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127283,127308,127460,127541,127543,127563

Modified: cfe/branches/release_29/tools/c-index-test/c-index-test.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/tools/c-index-test/c-index-test.c?rev=127633&r1=127632&r2=127633&view=diff
==============================================================================
--- cfe/branches/release_29/tools/c-index-test/c-index-test.c (original)
+++ cfe/branches/release_29/tools/c-index-test/c-index-test.c Mon Mar 14 18:08:03 2011
@@ -990,7 +990,7 @@
 
 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)

Modified: cfe/branches/release_29/tools/libclang/CIndexer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/tools/libclang/CIndexer.cpp?rev=127633&r1=127632&r2=127633&view=diff
==============================================================================
--- cfe/branches/release_29/tools/libclang/CIndexer.cpp (original)
+++ cfe/branches/release_29/tools/libclang/CIndexer.cpp Mon Mar 14 18:08:03 2011
@@ -32,6 +32,7 @@
 #include <sstream>
 
 #ifdef __CYGWIN__
+#include <cygwin/version.h>
 #include <sys/cygwin.h>
 #define LLVM_ON_WIN32 1
 #endif
@@ -60,8 +61,12 @@
 #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);
   LibClangPath.eraseComponent();