mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Check missed during merge.
This commit is contained in:
		@@ -1067,7 +1067,7 @@ server_client_resize_force(struct window_pane *wp)
 | 
				
			|||||||
	memset(&ws, 0, sizeof ws);
 | 
						memset(&ws, 0, sizeof ws);
 | 
				
			||||||
	ws.ws_col = wp->sx;
 | 
						ws.ws_col = wp->sx;
 | 
				
			||||||
	ws.ws_row = wp->sy - 1;
 | 
						ws.ws_row = wp->sy - 1;
 | 
				
			||||||
	if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
 | 
						if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
 | 
				
			||||||
#ifdef __sun
 | 
					#ifdef __sun
 | 
				
			||||||
		if (errno != EINVAL && errno != ENXIO)
 | 
							if (errno != EINVAL && errno != ENXIO)
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
@@ -1096,7 +1096,7 @@ server_client_resize_event(__unused int fd, __unused short events, void *data)
 | 
				
			|||||||
	memset(&ws, 0, sizeof ws);
 | 
						memset(&ws, 0, sizeof ws);
 | 
				
			||||||
	ws.ws_col = wp->sx;
 | 
						ws.ws_col = wp->sx;
 | 
				
			||||||
	ws.ws_row = wp->sy;
 | 
						ws.ws_row = wp->sy;
 | 
				
			||||||
	if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
 | 
						if (wp->fd != -1 && ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
 | 
				
			||||||
#ifdef __sun
 | 
					#ifdef __sun
 | 
				
			||||||
		/*
 | 
							/*
 | 
				
			||||||
		 * Some versions of Solaris apparently can return an error when
 | 
							 * Some versions of Solaris apparently can return an error when
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user