cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 04:50:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #116 from trondn/cmake-build-fixes

Browse Source 
Cmake build fixes
This commit is contained in:
Nick Mathewson 2014-03-21 11:45:31 -04:00
commit f5c0d6c378
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -533,6 +533,8 @@ set(HDR_PUBLIC
include/event2/tag_compat.h include/event2/tag_compat.h
include/event2/thread.h include/event2/thread.h
include/event2/util.h include/event2/util.h
include/event2/visibility.h
${PROJECT_BINARY_DIR}/include/event2/event-config.h
) )
set(SRC_CORE set(SRC_CORE
@ -1114,7 +1116,7 @@ set_target_properties(event event_core event_extra
# #
install(TARGETS event event_core event_extra install(TARGETS event event_core event_extra
EXPORT LibeventTargets EXPORT LibeventTargets
RUNTIME DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT bin RUNTIME DESTINATION "${EVENT_INSTALL_BIN_DIR}" COMPONENT bin
LIBRARY DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT lib LIBRARY DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT lib
ARCHIVE DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT lib ARCHIVE DESTINATION "${EVENT_INSTALL_LIB_DIR}" COMPONENT lib
PUBLIC_HEADER DESTINATION "${EVENT_INSTALL_INCLUDE_DIR}/event2" COMPONENT dev) PUBLIC_HEADER DESTINATION "${EVENT_INSTALL_INCLUDE_DIR}/event2" COMPONENT dev)

20
test/test-fdleak.c
View File

@ -57,7 +57,7 @@
#endif #endif
/* Provide storage for the address, both for the server & the clients */ /* Provide storage for the address, both for the server & the clients */
static struct sockaddr_in sin; static struct sockaddr_in saddr;
/* Number of sucessful requests so far */ /* Number of sucessful requests so far */
static int num_requests; static int num_requests;
@ -131,7 +131,7 @@ start_loop(void)
listener = evconnlistener_new_bind(base, listener_accept_cb, NULL, listener = evconnlistener_new_bind(base, listener_accept_cb, NULL,
LEV_OPT_CLOSE_ON_FREE|LEV_OPT_REUSEABLE, LEV_OPT_CLOSE_ON_FREE|LEV_OPT_REUSEABLE,
-1, (struct sockaddr *)&sin, sizeof(sin)); -1, (struct sockaddr *)&saddr, sizeof(saddr));
if (listener == NULL) { if (listener == NULL) {
my_perror("Could not create listener!"); my_perror("Could not create listener!");
exit(1); exit(1);
@ -145,8 +145,8 @@ start_loop(void)
my_perror("getsockname()"); my_perror("getsockname()");
exit(1); exit(1);
} }
memcpy(&sin, &ss, sizeof(sin)); memcpy(&saddr, &ss, sizeof(saddr));
if (sin.sin_family != AF_INET) { if (saddr.sin_family != AF_INET) {
puts("AF mismatch from getsockname()."); puts("AF mismatch from getsockname().");
exit(1); exit(1);
} }
@ -208,8 +208,8 @@ start_client(struct event_base *base)
BEV_OPT_CLOSE_ON_FREE); BEV_OPT_CLOSE_ON_FREE);
bufferevent_setcb(bev, client_read_cb, NULL, client_event_cb, NULL); bufferevent_setcb(bev, client_read_cb, NULL, client_event_cb, NULL);
if (bufferevent_socket_connect(bev, (struct sockaddr *)&sin, if (bufferevent_socket_connect(bev, (struct sockaddr *)&saddr,
sizeof(sin)) < 0) { sizeof(saddr)) < 0) {
my_perror("Could not connect!"); my_perror("Could not connect!");
bufferevent_free(bev); bufferevent_free(bev);
exit(2); exit(2);
@ -236,10 +236,10 @@ main(int argc, char **argv)
#endif #endif
/* Set up an address, used by both client & server. */ /* Set up an address, used by both client & server. */
memset(&sin, 0, sizeof(sin)); memset(&saddr, 0, sizeof(saddr));
sin.sin_family = AF_INET; saddr.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(0x7f000001); saddr.sin_addr.s_addr = htonl(0x7f000001);
sin.sin_port = 0; /* Tell the implementation to pick a port. */ saddr.sin_port = 0; /* Tell the implementation to pick a port. */
start_loop(); start_loop();