Changeset 14682
- Timestamp:
- Feb 23, 2016, 5:07:43 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r14680 r14682 515 515 if(ICONV_FOUND) 516 516 add_definitions(-DHAVE_ICONV) 517 if(ICONV_SECOND_ARGUMENT_IS_CONST) 518 add_definitions(-DICONV_SECOND_ARGUMENT_IS_CONST) 519 endif() 517 520 endif() 518 521 -
trunk/cmake/FindICONV.cmake
r14350 r14682 23 23 set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) 24 24 25 check_c_source_compiles( 26 " 25 check_c_source_compiles(" 27 26 #include <iconv.h> 28 27 int main () … … 35 34 iconv (conv, &in, &ilen, &out, &olen); 36 35 return 0; 37 }" ICONV_SECOND_ARGUMENT_IS_CONST) 36 }" 37 ICONV_SECOND_ARGUMENT_IS_CONST 38 FAIL_REGEX "incompatible pointer type" 39 FAIL_REGEX "discards qualifiers in nested pointer types") 38 40 39 41 set(CMAKE_REQUIRED_INCLUDES) -
trunk/libtransmission/utils.c
r14678 r14682 1035 1035 for (i=0; !ret && i<encoding_count; ++i) 1036 1036 { 1037 #ifdef ICONV_SECOND_ARGUMENT_IS_CONST 1038 const char * inbuf = in; 1039 #else 1037 1040 char * inbuf = (char*) in; 1041 #endif 1038 1042 char * outbuf = out; 1039 1043 size_t inbytesleft = inlen;
Note: See TracChangeset
for help on using the changeset viewer.