about summary refs log tree commit diff stats
path: root/src/LYCurses.h
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2001-11-08 20:59:59 -0500
committerThomas E. Dickey <dickey@invisible-island.net>2001-11-08 20:59:59 -0500
commit6cb04c09f063188e7dae5d1e5e5c69eb64703626 (patch)
tree46c2950351bf3f2cde1f610eae7bc9cfb52c5221 /src/LYCurses.h
parentf78e27712a4f44dbdf3c1532c3d1958989bf40a5 (diff)
downloadlynx-snapshots-6cb04c09f063188e7dae5d1e5e5c69eb64703626.tar.gz
snapshot of project "lynx", label v2-8-5dev_4
Diffstat (limited to 'src/LYCurses.h')
-rw-r--r--src/LYCurses.h31
1 files changed, 18 insertions, 13 deletions
diff --git a/src/LYCurses.h b/src/LYCurses.h
index 5de3fc6b..9ac77ed7 100644
--- a/src/LYCurses.h
+++ b/src/LYCurses.h
@@ -171,22 +171,27 @@ typedef struct {
 #endif
 
 #ifdef HAVE_CONFIG_H
-# ifdef HAVE_NCURSES_NCURSES_H
-#   include <ncurses/ncurses.h>
+# ifdef HAVE_NCURSESW_NCURSES_H
+#  undef GCC_PRINTFLIKE		/* <libutf8.h> may define 'printf' */
+#  include <ncursesw/ncurses.h>
 # else
-#  ifdef HAVE_NCURSES_H
-#   include <ncurses.h>
+#  ifdef HAVE_NCURSES_NCURSES_H
+#   include <ncurses/ncurses.h>
 #  else
-#   ifdef HAVE_CURSESX_H
-#    include <cursesX.h>	/* Ultrix */
+#   ifdef HAVE_NCURSES_H
+#    include <ncurses.h>
 #   else
-#    ifdef HAVE_JCURSES_H
-#     include <jcurses.h>	/* sony_news */
+#    ifdef HAVE_CURSESX_H
+#     include <cursesX.h>	/* Ultrix */
 #    else
-#     ifdef HAVE_XCURSES
-#      include <xcurses.h>	/* PDCurses' UNIX port */
+#     ifdef HAVE_JCURSES_H
+#      include <jcurses.h>	/* sony_news */
 #     else
-#      include <curses.h>	/* default */
+#      ifdef HAVE_XCURSES
+#       include <xcurses.h>	/* PDCurses' UNIX port */
+#      else
+#       include <curses.h>	/* default */
+#      endif
 #     endif
 #    endif
 #   endif
@@ -613,8 +618,8 @@ FANCY_CURSES.  Check your config.log to see why the FANCY_CURSES test failed.
  * If the screen library allows us to specify "default" color, allow user to 
  * control it.
  */
-#if USE_DEFAULT_COLORS
-#if USE_SLANG || (HAVE_ASSUME_DEFAULT_COLORS && !defined(USE_COLOR_STYLE))
+#ifdef USE_DEFAULT_COLORS
+#if USE_SLANG || (defined(HAVE_ASSUME_DEFAULT_COLORS) && !defined(USE_COLOR_STYLE))
 #define EXP_ASSUMED_COLOR 1
 #endif
 #endif