Fix or hide some compile warnings.

This commit is contained in:
John Maguire 2011-06-16 14:38:13 +00:00
parent 54e9299c08
commit 4393199d66
3 changed files with 8 additions and 4 deletions

View File

@ -62,10 +62,9 @@ Portfwd::init(unsigned int timeout)
}
// get lan IP:
char lanaddr[16];
int i;
i = UPNP_GetValidIGD(devlist, urls, data, (char*)&lanaddr, 16);
UPNP_GetValidIGD(devlist, urls, data, (char*)&lanaddr, 16);
m_lanip = std::string(lanaddr);
freeUPNPDevlist(devlist);
get_status();
return true;

View File

@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.6)
# Source files
set(SQLITE-SOURCES
sqlite3.c
qsql_sqlite.cpp
smain.cpp
clementinesqlcachedresult.cpp
@ -22,11 +21,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
add_definitions(-DQT_PLUGIN -DQT_NO_DEBUG)
add_definitions(-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS)
add_library(sqlite STATIC sqlite3.c)
set_target_properties(sqlite PROPERTIES COMPILE_FLAGS
"-Wno-pointer-to-int-cast -Wno-int-to-pointer-cast")
add_library(qsqlite STATIC
${SQLITE-SOURCES}
${SQLITE-SOURCES-MOC}
${SQLITE-WIN32-RESOURCES}
)
target_link_libraries(qsqlite
sqlite
${QT_LIBRARIES}
)

View File

@ -63,6 +63,7 @@ QString CandidateTypeToString(pj_ice_cand_type type) {
case PJ_ICE_CAND_TYPE_RELAYED:
return "relayed";
}
return "unknown";
}
pj_ice_cand_type CandidateStringToType(const QString& type) {