Przeglądaj źródła

Merge branch 'branch_libev' of https://github.com/wangyu-/UDPspeeder into branch_libev

wangyu- 7 lat temu
rodzic
commit
a94c75d6b7
4 zmienionych plików z 9 dodań i 5 usunięć
  1. 1 1
      common.h
  2. 2 2
      fec_manager.cpp
  3. 1 1
      log.h
  4. 5 1
      makefile

+ 1 - 1
common.h

@@ -26,7 +26,7 @@
 #include <netinet/tcp.h>   //Provides declarations for tcp header
 #include <netinet/udp.h>
 #include <netinet/ip.h>    //Provides declarations for ip header
-#include <netinet/if_ether.h>
+//#include <netinet/if_ether.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <arpa/inet.h>

+ 2 - 2
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);

+ 1 - 1
log.h

@@ -28,7 +28,7 @@
 #include <netinet/tcp.h>   //Provides declarations for tcp header
 #include <netinet/udp.h>
 #include <netinet/ip.h>    //Provides declarations for ip header
-#include <netinet/if_ether.h>
+//#include <netinet/if_ether.h>
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/socket.h>

+ 5 - 1
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}