12 files changed, 32 insertions, 30 deletions
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index a7fb4b1..ebf74eb 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -1,11 +1,11 @@
 # Makefile for libdialog
-# $Id: Makefile,v 1.1.1.1 1994/10/11 23:30:50 ache Exp $
+# $Id: Makefile,v 1.2 1994/10/12 01:54:38 ache Exp $
 
 LIB=    dialog
 SRCS=   kernel.c rc.c checklist.c inputbox.c menubox.c msgbox.c \
 	radiolist.c textbox.c yesno.c
 
-CFLAGS+= -Wall -Wstrict-prototypes -DHAVE_NCURSES -DLOCALE
+CFLAGS+= -Wall -Wstrict-prototypes -DLOCALE
 
 LDADD+= -lncurses -lmytinfo
 
diff --git a/gnu/lib/libdialog/checklist.c b/gnu/lib/libdialog/checklist.c
index 78a6b95..4bdaadc 100644
--- a/gnu/lib/libdialog/checklist.c
+++ b/gnu/lib/libdialog/checklist.c
@@ -19,8 +19,8 @@
  */
 
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 
 
 static void print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int status, int choice, int selected);
diff --git a/gnu/lib/libdialog/dialog.h b/gnu/lib/libdialog/dialog.h
index ffc03ac..f7e6fec 100644
--- a/gnu/lib/libdialog/dialog.h
+++ b/gnu/lib/libdialog/dialog.h
@@ -18,9 +18,30 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define HAVE_NCURSES
+
+#ifdef HAVE_NCURSES
+#include <ncurses.h>
+
+#else
+
+#ifdef ultrix
+#include <cursesX.h>
+#else
+#include <curses.h>
+#endif
+
+#endif
+
 #define VERSION "0.4"
 #define MAX_LEN 2048
 
+#ifdef HAVE_NCURSES
+extern bool use_shadow;
+void draw_shadow(WINDOW *win, int y, int x, int height, int width);
+#endif
+void draw_box(WINDOW *win, int y, int x, int height, int width, chtype box, chtype border);
+
 void dialog_create_rc(unsigned char *filename);
 int dialog_yesno(unsigned char *title, unsigned char *prompt, int height, int width);
 int dialog_msgbox(unsigned char *title, unsigned char *prompt, int height, int width, int pause);
diff --git a/gnu/lib/libdialog/dialog.priv.h b/gnu/lib/libdialog/dialog.priv.h
index 90a2432..0222ba2 100644
--- a/gnu/lib/libdialog/dialog.priv.h
+++ b/gnu/lib/libdialog/dialog.priv.h
@@ -26,19 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_NCURSES
-#include <ncurses.h>
-
-#else
-
-#ifdef ultrix
-#include <cursesX.h>
-#else
-#include <curses.h>
-#endif
-
-#endif
-
 #if defined(LOCALE)
 #include <locale.h>
 #endif
@@ -182,7 +169,6 @@ chtype attributes[] = {
 
 #ifdef HAVE_NCURSES
 extern bool use_colors;
-extern bool use_shadow;
 #endif
 
 extern chtype attributes[];
@@ -211,8 +197,3 @@ void color_setup(void);
 void attr_clear(WINDOW *win, int height, int width, chtype attr);
 void print_autowrap(WINDOW *win, unsigned char *prompt, int width, int y, int x);
 void print_button(WINDOW *win, unsigned char *label, int y, int x, int selected);
-void draw_box(WINDOW *win, int y, int x, int height, int width, chtype box, chtype border);
-#ifdef HAVE_NCURSES
-void draw_shadow(WINDOW *win, int y, int x, int height, int width);
-#endif
-
diff --git a/gnu/lib/libdialog/inputbox.c b/gnu/lib/libdialog/inputbox.c
index a30e39a..35fd527 100644
--- a/gnu/lib/libdialog/inputbox.c
+++ b/gnu/lib/libdialog/inputbox.c
@@ -19,8 +19,8 @@
  */
 
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 
 
 /*
diff --git a/gnu/lib/libdialog/kernel.c b/gnu/lib/libdialog/kernel.c
index 6f23b0f..b6e7c01 100644
--- a/gnu/lib/libdialog/kernel.c
+++ b/gnu/lib/libdialog/kernel.c
@@ -79,8 +79,8 @@
 
 #define __DIALOG_MAIN__
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 #ifdef HAVE_NCURSES
 #include "colors.h"
 #endif
diff --git a/gnu/lib/libdialog/menubox.c b/gnu/lib/libdialog/menubox.c
index da818aa..2e95a69 100644
--- a/gnu/lib/libdialog/menubox.c
+++ b/gnu/lib/libdialog/menubox.c
@@ -19,8 +19,8 @@
  */
 
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 
 
 static void print_item(WINDOW *win, unsigned char *tag, unsigned char *item, int choice, int selected);
diff --git a/gnu/lib/libdialog/msgbox.c b/gnu/lib/libdialog/msgbox.c
index c28a7c8..fe19d00 100644
--- a/gnu/lib/libdialog/msgbox.c
+++ b/gnu/lib/libdialog/msgbox.c
@@ -19,8 +19,8 @@
  */
 
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 
 
 /*
diff --git a/gnu/lib/libdialog/radiolist.c b/gnu/lib/libdialog/radiolist.c
index fd69bb8..243b48c 100644
--- a/gnu/lib/libdialog/radiolist.c
+++ b/gnu/lib/libdialog/radiolist.c
@@ -20,8 +20,8 @@
  */
 
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 
 
 static void print_item(WINDOW *win, char *tag, char *item, int status, int choice, int selected);
diff --git a/gnu/lib/libdialog/rc.c b/gnu/lib/libdialog/rc.c
index 7d244da..36631a6 100644
--- a/gnu/lib/libdialog/rc.c
+++ b/gnu/lib/libdialog/rc.c
@@ -18,8 +18,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 #include "colors.h"
 #include "rc.h"
 
diff --git a/gnu/lib/libdialog/textbox.c b/gnu/lib/libdialog/textbox.c
index e99cc86..ebfe67f 100644
--- a/gnu/lib/libdialog/textbox.c
+++ b/gnu/lib/libdialog/textbox.c
@@ -19,8 +19,8 @@
  */
 
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 
 
 static void back_lines(int n);
diff --git a/gnu/lib/libdialog/yesno.c b/gnu/lib/libdialog/yesno.c
index 9a34fb5..6d15d31 100644
--- a/gnu/lib/libdialog/yesno.c
+++ b/gnu/lib/libdialog/yesno.c
@@ -19,8 +19,8 @@
  */
 
 
-#include "dialog.priv.h"
 #include <dialog.h>
+#include "dialog.priv.h"
 
 
 /*