|  | @@ -67,14 +67,10 @@ static gpr_timespec n_seconds_time(int n) {
 | 
	
		
			
				|  |  |  static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void drain_cq(grpc_completion_queue *cq) {
 | 
	
		
			
				|  |  | -  grpc_event *ev;
 | 
	
		
			
				|  |  | -  grpc_completion_type type;
 | 
	
		
			
				|  |  | +  grpc_event ev;
 | 
	
		
			
				|  |  |    do {
 | 
	
		
			
				|  |  |      ev = grpc_completion_queue_next(cq, five_seconds_time());
 | 
	
		
			
				|  |  | -    GPR_ASSERT(ev);
 | 
	
		
			
				|  |  | -    type = ev->type;
 | 
	
		
			
				|  |  | -    grpc_event_finish(ev);
 | 
	
		
			
				|  |  | -  } while (type != GRPC_QUEUE_SHUTDOWN);
 | 
	
		
			
				|  |  | +  } while (ev.type != GRPC_QUEUE_SHUTDOWN);
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void shutdown_server(grpc_end2end_test_fixture *f) {
 |