summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 040ef01)
raw | patch | inline | side by side (parent: 040ef01)
author | Reid Kleckner <reid@kleckner.net> | |
Wed, 7 Aug 2013 00:29:15 +0000 (00:29 +0000) | ||
committer | Reid Kleckner <reid@kleckner.net> | |
Wed, 7 Aug 2013 00:29:15 +0000 (00:29 +0000) |
Previously this check was guarded by MSVC, which doesn't distinguish
between the compiler and the headers/library. This enables clang to
compile more of LLVM on Windows with Microsoft headers.
Remove some unused macros while I'm here: error_t and LTDL stuff.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187839 91177308-0d34-0410-b5e6-96231b3b80d8
between the compiler and the headers/library. This enables clang to
compile more of LLVM on Windows with Microsoft headers.
Remove some unused macros while I'm here: error_t and LTDL stuff.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@187839 91177308-0d34-0410-b5e6-96231b3b80d8
cmake/config-ix.cmake | patch | blob | history | |
include/llvm/Config/config.h.cmake | patch | blob | history |
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 9f686c3dc77da227fdf33b0ccd9966fed1fb854b..85c4d81255f3d37181b65e6135a3b0bf042cc6e3 100755 (executable)
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
check_type_exists(int64_t "${headers}" HAVE_INT64_T)
check_type_exists(uint64_t "${headers}" HAVE_UINT64_T)
check_type_exists(u_int64_t "${headers}" HAVE_U_INT64_T)
-check_type_exists(error_t errno.h HAVE_ERROR_T)
# available programs checks
function(llvm_find_program name)
# CHECK_LIBRARY_EXISTS(imagehlp ??? . HAVE_LIBIMAGEHLP)
endif( MINGW )
+if (NOT HAVE_STRTOLL)
+ # Use _strtoi64 if strtoll is not available.
+ check_symbol_exists(_strtoi64 stdlib.h have_strtoi64)
+ if (have_strtoi64)
+ set(HAVE_STRTOLL 1)
+ set(strtoll "_strtoi64")
+ set(strtoull "_strtoui64")
+ endif ()
+endif ()
+
if( MSVC )
- set(error_t int)
- set(LTDL_SYSSEARCHPATH "")
- set(LTDL_DLOPEN_DEPLIBS 1)
set(SHLIBEXT ".lib")
- set(LTDL_OBJDIR "_libs")
- set(HAVE_STRTOLL 1)
- set(strtoll "_strtoi64")
- set(strtoull "_strtoui64")
set(stricmp "_stricmp")
set(strdup "_strdup")
-else( MSVC )
- set(LTDL_SYSSEARCHPATH "") # TODO
- set(LTDL_DLOPEN_DEPLIBS 0) # TODO
endif( MSVC )
if( PURE_WINDOWS )
index 97035937fced67bdc987487865630942bdf6ccd4..b34c404733ed6a37a7872099cbed7da47af96a0c 100644 (file)
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define to a type to use for `error_t' if it is not otherwise available. */
-#cmakedefine error_t ${error_t}
-
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t