From bb9802f83d5220fecee046960d8fb528210123b2 Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Tue, 20 Jan 2015 23:56:29 +0100 Subject: resize_term -> resizeterm Apparently we do need to call the "outer-level" function. --- CMakeLists.txt | 2 +- config.h.in | 2 +- src/utils.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d52a1bb..f3ce39b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ include_directories (${ZLIB_INCLUDE_DIRS} # Configuration include (CheckFunctionExists) set (CMAKE_REQUIRED_LIBRARIES ${dependencies_LIBRARIES}) -CHECK_FUNCTION_EXISTS ("resize_term" HAVE_RESIZE_TERM) +CHECK_FUNCTION_EXISTS ("resizeterm" HAVE_RESIZETERM) # Localization find_package (Gettext REQUIRED) diff --git a/config.h.in b/config.h.in index b8382c1..dfc1111 100644 --- a/config.h.in +++ b/config.h.in @@ -8,7 +8,7 @@ #define GETTEXT_PACKAGE PROJECT_NAME #define GETTEXT_DIRNAME "${CMAKE_INSTALL_PREFIX}/share/locale" -#cmakedefine HAVE_RESIZE_TERM +#cmakedefine HAVE_RESIZETERM #endif /* ! CONFIG_H */ diff --git a/src/utils.c b/src/utils.c index ebbd4a9..b7aa5da 100644 --- a/src/utils.c +++ b/src/utils.c @@ -85,19 +85,19 @@ xstrtoul (unsigned long *out, const char *s, int base) void update_curses_terminal_size (void) { -#if defined (HAVE_RESIZE_TERM) && defined (TIOCGWINSZ) +#if defined (HAVE_RESIZETERM) && defined (TIOCGWINSZ) struct winsize size; if (!ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &size)) { char *row = getenv ("LINES"); char *col = getenv ("COLUMNS"); unsigned long tmp; - resize_term ( + resizeterm ( (row && xstrtoul (&tmp, row, 10)) ? tmp : size.ws_row, (col && xstrtoul (&tmp, col, 10)) ? tmp : size.ws_col); } -#else // HAVE_RESIZE_TERM && TIOCGWINSZ +#else // HAVE_RESIZETERM && TIOCGWINSZ endwin (); refresh (); -#endif // HAVE_RESIZE_TERM && TIOCGWINSZ +#endif // HAVE_RESIZETERM && TIOCGWINSZ } -- cgit v1.2.3-70-g09d2