mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 12:53:13 +00:00
use configure to define NOMACROS
(added in 9ec808a4c)
This commit is contained in:
David Adam
parent
1edb7d3aa5
commit
9b43e6fa8b
10 changed files with 0 additions and 30 deletions
|
|
@ -14,10 +14,7 @@ Functions used for implementing the set_color builtin.
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
|
|
@ -50,10 +50,7 @@ parts of fish.
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
3
env.cpp
3
env.cpp
|
|
@ -24,10 +24,7 @@
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
|
|
@ -35,10 +35,7 @@
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,7 @@
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
3
io.cpp
3
io.cpp
|
|
@ -27,10 +27,7 @@ Utilities for io redirection.
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
|
|
@ -25,10 +25,7 @@
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
3
proc.cpp
3
proc.cpp
|
|
@ -36,10 +36,7 @@ Some of the code in this file is based on code from the Glibc manual.
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
|
|
@ -48,10 +48,7 @@ commence.
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,7 @@ efficient way for transforming that to the desired screen content.
|
||||||
#elif HAVE_NCURSES_CURSES_H
|
#elif HAVE_NCURSES_CURSES_H
|
||||||
#include <ncurses/curses.h>
|
#include <ncurses/curses.h>
|
||||||
#else
|
#else
|
||||||
// Solaris curses defines lots of unneeded macros which conflict with C++
|
|
||||||
#define NOMACROS
|
|
||||||
#include <curses.h>
|
#include <curses.h>
|
||||||
#undef NOMACROS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_TERM_H
|
#if HAVE_TERM_H
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue