diff --git a/common.h b/common.h index 4495129..7e1e788 100644 --- a/common.h +++ b/common.h @@ -26,7 +26,7 @@ #include //Provides declarations for tcp header #include #include //Provides declarations for ip header -#include +//#include #include #include #include diff --git a/fec_manager.cpp b/fec_manager.cpp index 7a504b8..1ade0da 100644 --- a/fec_manager.cpp +++ b/fec_manager.cpp @@ -177,7 +177,7 @@ int fec_encode_manager_t::append(char *s,int len/*,int &is_first_packet*/) { if(counter==0) { - itimerspec its; + my_itimerspec its; memset(&its.it_interval,0,sizeof(its.it_interval)); first_packet_time=get_current_time_us(); my_time_t tmp_time=fec_timeout+first_packet_time; @@ -414,7 +414,7 @@ int fec_encode_manager_t::input(char *s,int len/*,int &is_first_packet*/) output_n=actual_data_num+actual_redundant_num; blob_encode.clear(); - itimerspec its; + my_itimerspec its; memset(&its,0,sizeof(its)); ev_timer_stop(loop, &timer); //timerfd_settime(timer_fd,TFD_TIMER_ABSTIME,&its,0); diff --git a/log.h b/log.h index b97acd0..37e290d 100755 --- a/log.h +++ b/log.h @@ -28,7 +28,7 @@ #include //Provides declarations for tcp header #include #include //Provides declarations for ip header -#include +//#include #include #include #include diff --git a/makefile b/makefile index 1dcf610..5b2674e 100755 --- a/makefile +++ b/makefile @@ -17,7 +17,11 @@ TAR=${NAME}_binaries.tar.gz `echo ${TARGETS}|sed -r 's/([^ ]+)/speederv2_\1/g'` all:git_version rm -f ${NAME} - ${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb -static -O3 + ${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb -static -O3 + +cygwin:git_version + rm -f ${NAME} + ${cc_local} -o ${NAME} -I. ${SOURCES} ${FLAGS} -lrt -ggdb -static -O3 -D_GNU_SOURCE mac:git_version rm -f ${NAME}