Skip to content

Handle 'panel.h' being in an 'ncurses' directory #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sulix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle 'panel.h' being in an 'ncurses' directory #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET

/* Define to 1 if you have the <ncurses/panel.h> header file. */
#undef HAVE_NCURSES_PANEL_H

/* Define to 1 if you have the <panel.h> header file. */
#undef HAVE_PANEL_H

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ AC_SEARCH_LIBS([new_panel], [panel], ,

# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([errno.h fcntl.h limits.h panel.h stdlib.h string.h unistd.h])
AC_CHECK_HEADERS([errno.h fcntl.h limits.h panel.h ncurses/panel.h stdlib.h string.h unistd.h])

# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL
Expand Down
7 changes: 7 additions & 0 deletions curses/ConWin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@

#define INCLUDED_CONWIN_HPP

#include "config.h"
#if defined(HAVE_PANEL_H)
#include <panel.h>
#elif defined(HAVE_NCURSES_PANEL_H)
#include <ncurses/panel.h>
#else
#error "Couldn't find a panel.h header."
#endif
#undef border // It interferes with my member function

#define KEY_ESCAPE 0x1B
Expand Down