Ticket #3628: mc-3628-03-restructure-ncurses-define.patch

File mc-3628-03-restructure-ncurses-define.patch, 1.4 KB (added by and, 8 years ago)

  • lib/tty/tty-ncurses.h 

    From 380e7479ab9e22c7812d9b1e5d7c46950191d614 Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Sun, 10 Apr 2016 16:00:10 +0000
Subject: [PATCH] Restructure ncurses defines

Restructure ncurses defines and remove ncursesw case.

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 lib/tty/tty-ncurses.h | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/tty/tty-ncurses.h b/lib/tty/tty-ncurses.h
index 4f0e603..a949628 100644
    a b  
    22#ifndef MC__TTY_NCURSES_H 
    33#define MC__TTY_NCURSES_H 
    44 
    5 #ifdef USE_NCURSES 
    6 #ifdef HAVE_NCURSES_CURSES_H 
    7 #include <ncurses/curses.h> 
    8 #elif defined (HAVE_NCURSES_NCURSES_H) 
    9 #include <ncurses/ncurses.h> 
     5#ifdef HAVE_NCURSESW_NCURSES_H 
     6#include <ncursesw/ncurses.h> 
    107#elif defined (HAVE_NCURSESW_CURSES_H) 
    118#include <ncursesw/curses.h> 
    12 #elif defined (HAVE_NCURSES_HCURSES_H) || defined (HAVE_NCURSES_H) 
     9#elif defined (HAVE_NCURSES_NCURSES_H) 
     10#include <ncurses/ncurses.h> 
     11#elif defined (HAVE_NCURSES_CURSES_H) 
     12#include <ncurses/curses.h> 
     13#elif defined (HAVE_NCURSES_H) 
    1314#include <ncurses.h> 
    1415#else 
    1516#include <curses.h> 
    1617#endif 
    17 #endif /* USE_NCURSES */ 
    18  
    19 #ifdef USE_NCURSESW 
    20 #include <ncursesw/curses.h> 
    21 #endif /* USE_NCURSESW */ 
    2218 
    2319/*** typedefs(not structures) and defined constants **********************************************/ 
    2420