[llvm-commits] [llvm] r120826 - in /llvm/trunk: cmake/config-ix.cmake include/llvm/Config/config.h.cmake lib/Support/Windows/PathV2.inc

Michael J. Spencer bigcheesegs at gmail.com
Fri Dec 3 10:48:56 PST 2010


Author: mspencer
Date: Fri Dec  3 12:48:56 2010
New Revision: 120826

URL: http://llvm.org/viewvc/llvm-project?rev=120826&view=rev
Log:
Support/FileSystem: Fix MinGW build. It doesn't have _chsize_s.

Modified:
    llvm/trunk/cmake/config-ix.cmake
    llvm/trunk/include/llvm/Config/config.h.cmake
    llvm/trunk/lib/Support/Windows/PathV2.inc

Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=120826&r1=120825&r2=120826&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Fri Dec  3 12:48:56 2010
@@ -108,6 +108,9 @@
 check_symbol_exists(strerror_r string.h HAVE_STRERROR_R)
 check_symbol_exists(strerror_s string.h HAVE_STRERROR_S)
 check_symbol_exists(setenv stdlib.h HAVE_SETENV)
+if ( LLVM_ON_WIN32 )
+  check_symbol_exists(_chsize_s io.h HAVE__CHSIZE_S)
+endif()
 
 check_symbol_exists(__GLIBC__ stdio.h LLVM_USING_GLIBC)
 if( LLVM_USING_GLIBC )

Modified: llvm/trunk/include/llvm/Config/config.h.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Config/config.h.cmake?rev=120826&r1=120825&r2=120826&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Config/config.h.cmake (original)
+++ llvm/trunk/include/llvm/Config/config.h.cmake Fri Dec  3 12:48:56 2010
@@ -327,6 +327,9 @@
 /* Define to 1 if you have the `setenv' function. */
 #cmakedefine HAVE_SETENV ${HAVE_SETENV}
 
+/* Define to 1 if you have the `_chsize_s' function. */
+#cmakedefine HAVE__CHSIZE_S ${HAVE__CHSIZE_S}
+
 /* Define to 1 if you have the `setjmp' function. */
 #undef HAVE_SETJMP
 

Modified: llvm/trunk/lib/Support/Windows/PathV2.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/PathV2.inc?rev=120826&r1=120825&r2=120826&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/PathV2.inc (original)
+++ llvm/trunk/lib/Support/Windows/PathV2.inc Fri Dec  3 12:48:56 2010
@@ -310,7 +310,11 @@
   int fd = ::_wopen(path_utf16.begin(), O_BINARY, S_IREAD | S_IWRITE);
   if (fd == -1)
     return error_code(errno, generic_category());
+#ifdef HAVE__CHSIZE_S
   errno_t error = ::_chsize_s(fd, size);
+#else
+  errno_t error = ::_chsize(fd, size);
+#endif
   ::close(fd);
   return error_code(error, generic_category());
 }





More information about the llvm-commits mailing list