Merge pull request Tencent#31 from dy2012/master

delete extra string.h header file
MrEthan · Jun 14, 2017 · ca8fe05 · ca8fe05
2 parents 425878b + ad9263e
commit ca8fe05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/co_closure.h b/co_closure.h
@@ -28,11 +28,11 @@ struct stCoClosure_t
 //-- 1.1 comac_argc
 
 #define comac_get_args_cnt( ... ) comac_arg_n( __VA_ARGS__ )
-#define comac_arg_n( _1,_2,_3,_4,_5,_6,_7,N,...) N
+#define comac_arg_n( _0,_1,_2,_3,_4,_5,_6,_7,N,...) N
 #define comac_args_seqs() 7,6,5,4,3,2,1,0
 #define comac_join_1( x,y ) x##y
 
-#define comac_argc( ... ) comac_get_args_cnt( __VA_ARGS__,comac_args_seqs() )
+#define comac_argc( ... ) comac_get_args_cnt( 0,##__VA_ARGS__,comac_args_seqs() )
 #define comac_join( x,y) comac_join_1( x,y )
 
 //-- 1.2 repeat

diff --git a/co_epoll.cpp b/co_epoll.cpp
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
-#include <string.h>
 
 #ifndef __APPLE__