X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_curses.h;h=2c3a314ddb590c87ee6121876e4c68ffe96160db;hp=f07e98a71c23d6c11ece661554fe865fc38d8c8c;hb=a4728d7539e255a0db34a628ff47e7fc66040ead;hpb=ce92f8c407db309ef5c3262cff1bd77d0a91b77d

diff --git a/mutt_curses.h b/mutt_curses.h
index f07e98a..2c3a314 100644
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -1,25 +1,16 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 2004 g10 Code GmbH
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- */ 
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
 
 #ifdef USE_SLANG_CURSES
 
-#ifndef unix /* this symbol is not defined by the hp-ux compiler (sigh) */
+#ifndef unix                    /* this symbol is not defined by the hp-ux compiler (sigh) */
 #define unix
 #endif /* unix */
 
@@ -39,13 +30,13 @@
 
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#else
-#ifdef HAVE_NCURSES_H
+#elif HAVE_NCURSES_NCURSES_H
+#include <ncurses/ncurses.h>
+#elif HAVE_NCURSES_H
 #include <ncurses.h>
 #else
 #include <curses.h>
 #endif
-#endif
 
 #define M_ENTER_C '\n'
 #define M_ENTER_S "\n"
@@ -102,8 +93,7 @@ void mutt_need_hard_redraw (void);
  * Support for color
  */
 
-enum
-{
+enum {
   MT_COLOR_HDEFAULT = 0,
   MT_COLOR_QUOTED,
   MT_COLOR_SIGNATURE,
@@ -128,12 +118,11 @@ enum
   MT_COLOR_MAX
 };
 
-typedef struct color_line
-{
+typedef struct color_line {
   regex_t rx;
   char *pattern;
-  pattern_t *color_pattern; /* compiled pattern to speed up index color
-                               calculation */
+  pattern_t *color_pattern;     /* compiled pattern to speed up index color
+                                   calculation */
   short fg;
   short bg;
   int pair;
@@ -160,21 +149,21 @@ void ci_start_color (void);
  */
 
 #if !defined(STDC_HEADERS) && !defined(NCURSES_VERSION) && !defined(USE_SLANG_CURSES)
-extern int endwin();
-extern int printw();
-extern int beep();
-extern int isendwin();
-extern int w32addch();
-extern int keypad();
-extern int wclrtobot();
-extern int mvprintw();
-extern int getcurx();
-extern int getcury();
-extern int noecho();
-extern int wdelch();
-extern int wrefresh();
-extern int wmove();
-extern int wclear();
-extern int waddstr();
-extern int wclrtoeol();
+extern int endwin ();
+extern int printw ();
+extern int beep ();
+extern int isendwin ();
+extern int w32addch ();
+extern int keypad ();
+extern int wclrtobot ();
+extern int mvprintw ();
+extern int getcurx ();
+extern int getcury ();
+extern int noecho ();
+extern int wdelch ();
+extern int wrefresh ();
+extern int wmove ();
+extern int wclear ();
+extern int waddstr ();
+extern int wclrtoeol ();
 #endif