Windows fixes.

pull/211/merge
Roger A. Light 11 years ago
parent 57816cb520
commit ae1477c08f

@ -11,8 +11,8 @@ endif (${WITH_SRV} STREQUAL ON)
add_executable(mosquitto_pub pub_client.c ${shared_src})
add_executable(mosquitto_sub sub_client.c ${shared_src})
target_link_libraries(mosquitto_pub mosquitto)
target_link_libraries(mosquitto_sub mosquitto)
target_link_libraries(mosquitto_pub libmosquitto)
target_link_libraries(mosquitto_sub libmosquitto)
install(TARGETS mosquitto_pub RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
install(TARGETS mosquitto_sub RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})

@ -54,9 +54,9 @@ int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *
char *loc = NULL;
int len;
char *args[3];
#endif
args[0] = NULL;
#endif
init_config(cfg);
@ -120,7 +120,7 @@ int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *
free(loc);
}
#else
#warn FIXME - config file support
// FIXME - config file support
#endif
/* Deal with real argc/argv */

@ -1016,7 +1016,7 @@ int _mosquitto_socket_nonblock(int sock)
return 1;
}
#else
opt = 1;
unsigned long opt = 1;
if(ioctlsocket(sock, FIONBIO, &opt)){
COMPAT_CLOSE(sock);
return 1;

Loading…
Cancel
Save