Kouhei Sutou
null+****@clear*****
Wed Mar 11 14:41:02 JST 2015
Kouhei Sutou 2015-03-11 14:41:02 +0900 (Wed, 11 Mar 2015) New Revision: 59e8ec3bad632f5099a52031e10cfde1a42ae09b https://github.com/groonga/groonga/commit/59e8ec3bad632f5099a52031e10cfde1a42ae09b Message: cmake onigmo: use __inline instead of inline for MSVC "inline" isn't available in C on MSVC. It's available only in C++. See also: https://msdn.microsoft.com/en-US/library/z8y1yy88.aspx Modified files: vendor/onigmo/CMakeLists.txt Modified: vendor/onigmo/CMakeLists.txt (+3 -0) =================================================================== --- vendor/onigmo/CMakeLists.txt 2015-03-11 14:20:12 +0900 (7f6cbea) +++ vendor/onigmo/CMakeLists.txt 2015-03-11 14:41:02 +0900 (8f90d3e) @@ -35,6 +35,9 @@ if(GRN_WITH_ONIGMO) ac_check_sizeof(long) add_definitions(-DEXPORT) + if(MSVC) + add_definitions(-Dinline=__inline) + endif() include_directories( ${ONIGMO_BINARY_DIR} -------------- next part -------------- HTML����������������������������...Download