Fix merge issues

Author: huitema

CMakeLists.txt

@@ -222,7 +222,7 @@ set(PICOHTTP_TEST_LIBRARY_FILES
     picoquictest/h3zero_stream_test.c
     picoquictest/h3zero_uri_test.c
     picoquictest/picomask_test.c
-    picoquictest/picomask_test.c
+    picoquictest/quicperf_test.c
     picoquictest/webtransport_test.c)
 
 OPTION(PICOQUIC_FETCH_PTLS "Fetch PicoTLS during configuration" OFF)

picoquictest/picomask_test.c

@@ -280,8 +280,10 @@ int picomask_test_step(picoquic_picomask_test_ctx_t* pt_ctx, int* is_active)
     int arrival_index = -1;
     uint64_t next_departure_time = UINT64_MAX;
     int departure_index = -1;
+#if 0
     int need_frame_departure = 0;
     uint64_t next_frame_time = UINT64_MAX;
+#endif
     uint64_t next_time = UINT64_MAX;
 
     /* Check earliest packet arrival */