use configure to define NOMACROS

(added in 9ec808a4c)
fish-shell · Dec 21, 2014 · 9b43e6f · 9b43e6f
1 parent 1edb7d3
commit 9b43e6f
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 30 deletions.
diff --git a/builtin_set_color.cpp b/builtin_set_color.cpp
@@ -14,10 +14,7 @@ Functions used for implementing the set_color builtin.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/common.cpp b/common.cpp
@@ -50,10 +50,7 @@ parts of fish.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/env.cpp b/env.cpp
@@ -24,10 +24,7 @@
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/fallback.cpp b/fallback.cpp
@@ -35,10 +35,7 @@
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/input.cpp b/input.cpp
@@ -27,10 +27,7 @@
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/io.cpp b/io.cpp
@@ -27,10 +27,7 @@ Utilities for io redirection.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/output.cpp b/output.cpp
@@ -25,10 +25,7 @@
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/proc.cpp b/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
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/reader.cpp b/reader.cpp
@@ -48,10 +48,7 @@ commence.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H

diff --git a/screen.cpp b/screen.cpp
@@ -23,10 +23,7 @@ efficient way for transforming that to the desired screen content.
 #elif HAVE_NCURSES_CURSES_H
 #include <ncurses/curses.h>
 #else
-// Solaris curses defines lots of unneeded macros which conflict with C++
-#define NOMACROS
 #include <curses.h>
-#undef NOMACROS
 #endif
 
 #if HAVE_TERM_H