diff --git a/curses.h b/curses.h
index 82e7a67a..50563efe 100644
--- a/curses.h
+++ b/curses.h
@@ -18,7 +18,7 @@
 ***************************************************************************
 */
 /*
-$Id: curses.h,v 1.33 2005/11/17 12:36:04 wmcbrine Exp $
+$Id: curses.h,v 1.34 2005/11/19 19:07:21 wmcbrine Exp $
 */
 /*
 *----------------------------------------------------------------------
@@ -1632,7 +1632,7 @@ extern chtype *acs_map;
 # define Args(x) ()
 #endif
 
-int     PDC_CDECL addchnstr Args(( chtype *, int ));
+int     PDC_CDECL addchnstr Args(( const chtype *, int ));
 int     PDC_CDECL baudrate Args(( void ));
 int     PDC_CDECL beep Args(( void ));
 int     PDC_CDECL border Args(( chtype, chtype, chtype, chtype, chtype, chtype, chtype, chtype ));
@@ -1640,7 +1640,7 @@ int     PDC_CDECL can_change_color  Args(( void ));
 int     PDC_CDECL cbreak Args(( void ));
 int     PDC_CDECL clearok Args(( WINDOW*, bool ));
 int     PDC_CDECL color_content Args(( short, short*, short*, short* ));
-int     PDC_CDECL copywin Args(( WINDOW*, WINDOW*, int, int, int, int, int, int, int ));
+int     PDC_CDECL copywin Args(( const WINDOW*, WINDOW*, int, int, int, int, int, int, int ));
 int     PDC_CDECL curs_set Args(( int ));
 int     PDC_CDECL def_prog_mode Args(( void ));
 int     PDC_CDECL def_shell_mode Args(( void ));
@@ -1686,7 +1686,7 @@ int     PDC_CDECL mvderwin Args(( WINDOW*, int, int ));
 int     PDC_CDECL mvprintw Args(( int, int, char*,... ));
 int     PDC_CDECL mvscanw Args(( int, int, char*,... ));
 #endif
-int     PDC_CDECL mvwaddnstr Args(( WINDOW*,int,int,char*,int ));
+int     PDC_CDECL mvwaddnstr Args(( WINDOW*,int,int,const char*,int ));
 int     PDC_CDECL mvwin Args(( WINDOW*, int, int ));
 chtype  PDC_CDECL mvwinch Args(( WINDOW*, int, int ));
 int     PDC_CDECL mvwinsertln Args(( WINDOW*, int, int ));
@@ -1699,8 +1699,8 @@ SCREEN* PDC_CDECL newterm Args(( char*, FILE*, FILE* ));
 WINDOW* PDC_CDECL newwin Args(( int, int, int, int ));
 int     PDC_CDECL noraw Args(( void ));
 int     PDC_CDECL notimeout Args(( WINDOW *, bool ));
-int     PDC_CDECL overlay Args(( WINDOW*, WINDOW* ));
-int     PDC_CDECL overwrite Args(( WINDOW*, WINDOW* ));
+int     PDC_CDECL overlay Args(( const WINDOW*, WINDOW* ));
+int     PDC_CDECL overwrite Args(( const WINDOW*, WINDOW* ));
 int     PDC_CDECL pair_content Args(( int, short*, short* ));
 int     PDC_CDECL pechochar Args(( WINDOW *, chtype ));
 int     PDC_CDECL pnoutrefresh Args(( WINDOW*, int, int, int, int, int, int ));
@@ -1727,7 +1727,7 @@ SCREEN* PDC_CDECL set_term Args(( SCREEN* ));
 int     PDC_CDECL setsyx Args(( int, int ));
 int     PDC_CDECL start_color Args(( void ));
 int     PDC_CDECL slk_init Args((int));
-int     PDC_CDECL slk_set Args((int, char *, int));
+int     PDC_CDECL slk_set Args((int, const char *, int));
 int     PDC_CDECL slk_refresh Args((void));
 int     PDC_CDECL slk_noutrefresh Args((void));
 char*   PDC_CDECL slk_label Args((int));
@@ -1751,10 +1751,10 @@ void    PDC_CDECL traceon Args(( void ));
 int     PDC_CDECL typeahead Args(( int ));
 char*   PDC_CDECL unctrl Args(( chtype ));
 int     PDC_CDECL vline Args(( chtype, int ));
-int     PDC_CDECL waddch Args(( WINDOW*, chtype ));
-int     PDC_CDECL waddchnstr Args(( WINDOW*, chtype*, int ));
-int     PDC_CDECL waddnstr Args(( WINDOW*, char*, int ));
-int     PDC_CDECL waddstr Args(( WINDOW*, char* ));
+int     PDC_CDECL waddch Args(( WINDOW*, const chtype ));
+int     PDC_CDECL waddchnstr Args(( WINDOW*, const chtype*, int ));
+int     PDC_CDECL waddnstr Args(( WINDOW*, const char*, int ));
+int     PDC_CDECL waddstr Args(( WINDOW*, const char* ));
 int     PDC_CDECL wattroff Args(( WINDOW*, attr_t ));
 int     PDC_CDECL wattron Args(( WINDOW*, attr_t ));
 int     PDC_CDECL wattrset Args(( WINDOW*, attr_t ));
@@ -1777,7 +1777,7 @@ int     PDC_CDECL winnstr Args(( WINDOW*, char*, int ));
 int     PDC_CDECL winsch Args(( WINDOW*, chtype ));
 int     PDC_CDECL winsdelln Args(( WINDOW*, int ));
 int     PDC_CDECL winsertln Args(( WINDOW* ));
-int     PDC_CDECL winsnstr Args(( WINDOW*, char*, int ));
+int     PDC_CDECL winsnstr Args(( WINDOW*, const char*, int ));
 int     PDC_CDECL wmove Args(( WINDOW*, int, int ));
 int     PDC_CDECL wnoutrefresh Args(( WINDOW* ));
 char    PDC_CDECL wordchar Args(( void ));
diff --git a/curspriv.h b/curspriv.h
index 1292a6cc..888606c6 100644
--- a/curspriv.h
+++ b/curspriv.h
@@ -18,7 +18,7 @@
 ***************************************************************************
 */
 /*
-$Id: curspriv.h,v 1.9 2004/09/14 07:53:09 rexx Exp $
+$Id: curspriv.h,v 1.10 2005/11/19 19:07:21 wmcbrine Exp $
 */
 /*
 *
@@ -296,7 +296,7 @@ int             PDC_chg_attr Args(( WINDOW*, chtype, int, int, int, int ));
 int             PDC_chins Args(( WINDOW*, chtype, bool ));
 int             PDC_clr_scrn Args(( WINDOW* ));
 int             PDC_clr_update Args(( WINDOW* ));
-int             PDC_copy_win Args(( WINDOW *,WINDOW *,int,int,int,int,int,int,int,int,bool ));
+int             PDC_copy_win Args(( const WINDOW *,WINDOW *,int,int,int,int,int,int,int,int,bool ));
 int             PDC_cursor_off Args(( void ));
 int             PDC_cursor_on Args(( void ));
 int             PDC_curs_set Args(( int ));
diff --git a/pdcurses/addch.c b/pdcurses/addch.c
index cd4ae1a1..5ed9a307 100644
--- a/pdcurses/addch.c
+++ b/pdcurses/addch.c
@@ -40,7 +40,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_addch  = "$Id: addch.c,v 1.1 2001/01/10 08:26:44 mark Exp $";
+char *rcsid_addch  = "$Id: addch.c,v 1.2 2005/11/19 19:07:21 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -48,12 +48,12 @@ char *rcsid_addch  = "$Id: addch.c,v 1.1 2001/01/10 08:26:44 mark Exp $";
   Name:                                                         addch
 
   Synopsis:
-  	int addch(chtype ch);
-  	int waddch(WINDOW *win, chtype ch);
-  	int mvaddch(int y, int x, chtype ch);
-  	int mvwaddch(WINDOW *win, int y, int x, chtype ch);
-  	int echochar(chtype ch);
-  	int wechochar(WINDOW *win, chtype ch);
+  	int addch(const chtype ch);
+  	int waddch(WINDOW *win, const chtype ch);
+  	int mvaddch(int y, int x, const chtype ch);
+  	int mvwaddch(WINDOW *win, int y, int x, const chtype ch);
+  	int echochar(const chtype ch);
+  	int wechochar(WINDOW *win, const chtype ch);
 
   X/Open Description:
  	The routine addch() inserts the character ch into the default
@@ -135,10 +135,10 @@ char *rcsid_addch  = "$Id: addch.c,v 1.1 2001/01/10 08:26:44 mark Exp $";
 
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	addch(chtype ch)
+int	PDC_CDECL	addch(const chtype ch)
 #else
 int	PDC_CDECL	addch(ch)
-chtype ch;
+const chtype ch;
 #endif
 /***********************************************************************/
 {
@@ -150,11 +150,11 @@ chtype ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	waddch(WINDOW *win, chtype ch)
+int	PDC_CDECL	waddch(WINDOW *win, const chtype ch)
 #else
 int	PDC_CDECL	waddch(win,ch)
 WINDOW *win;
-chtype ch;
+const chtype ch;
 #endif
 /***********************************************************************/
 {
@@ -166,12 +166,12 @@ chtype ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvaddch(int y, int x, chtype ch)
+int	PDC_CDECL	mvaddch(int y, int x, const chtype ch)
 #else
 int	PDC_CDECL	mvaddch(y,x,ch)
 int y;
 int x;
-chtype ch;
+const chtype ch;
 #endif
 /***********************************************************************/
 {
@@ -184,13 +184,13 @@ chtype ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvwaddch(WINDOW *win, int y, int x, chtype ch)
+int	PDC_CDECL	mvwaddch(WINDOW *win, int y, int x, const chtype ch)
 #else
 int	PDC_CDECL	mvwaddch(win,y,x,ch)
 WINDOW *win;
 int y;
 int x;
-chtype ch;
+const chtype ch;
 #endif
 /***********************************************************************/
 {
@@ -203,10 +203,10 @@ chtype ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	echochar(chtype ch)
+int	PDC_CDECL	echochar(const chtype ch)
 #else
 int	PDC_CDECL	echochar(ch)
-chtype ch;
+const chtype ch;
 #endif
 /***********************************************************************/
 {
@@ -220,11 +220,11 @@ chtype ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	wechochar(WINDOW *win, chtype ch)
+int	PDC_CDECL	wechochar(WINDOW *win, const chtype ch)
 #else
 int	PDC_CDECL	wechochar(win,ch)
 WINDOW *win;
-chtype ch;
+const chtype ch;
 #endif
 /***********************************************************************/
 {
diff --git a/pdcurses/addchstr.c b/pdcurses/addchstr.c
index a084ca95..93525bbe 100644
--- a/pdcurses/addchstr.c
+++ b/pdcurses/addchstr.c
@@ -44,7 +44,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_addchstr  = "$Id: addchstr.c,v 1.4 2005/11/12 20:54:58 wmcbrine Exp $";
+char *rcsid_addchstr  = "$Id: addchstr.c,v 1.5 2005/11/19 19:07:21 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -52,14 +52,14 @@ char *rcsid_addchstr  = "$Id: addchstr.c,v 1.4 2005/11/12 20:54:58 wmcbrine Exp
   Name:                                                        addchstr
 
   Synopsis:
-   int addchstr(chtype *ch);
-   int addchnstr(chtype *ch, int n);
-   int waddchstr(WINDOW *win, chtype *ch);
-   int waddchnstr(WINDOW *win, chtype *ch, int n);
-   int mvaddchstr(int y, int x, chtype *ch);
-   int mvaddchnstr(int y, int x, chtype *ch, int n);
-   int mvwaddchstr(WINDOW *, int y, int x, chtype *ch);
-   int mvwaddchnstr(WINDOW *, int y, int x, chtype *ch, int n);
+   int addchstr(const chtype *ch);
+   int addchnstr(const chtype *ch, int n);
+   int waddchstr(WINDOW *win, const chtype *ch);
+   int waddchnstr(WINDOW *win, const chtype *ch, int n);
+   int mvaddchstr(int y, int x, const chtype *ch);
+   int mvaddchnstr(int y, int x, const chtype *ch, int n);
+   int mvwaddchstr(WINDOW *, int y, int x, const chtype *ch);
+   int mvwaddchnstr(WINDOW *, int y, int x, const chtype *ch, int n);
 
   X/Open Description:
    These routines write a chtype directly into the window structure
@@ -96,10 +96,10 @@ char *rcsid_addchstr  = "$Id: addchstr.c,v 1.4 2005/11/12 20:54:58 wmcbrine Exp
 
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int   PDC_CDECL   addchstr(chtype *ch)
+int   PDC_CDECL   addchstr(const chtype *ch)
 #else
 int   PDC_CDECL   addchstr(ch)
-chtype *ch;
+const chtype *ch;
 #endif
 /***********************************************************************/
 {
@@ -111,10 +111,10 @@ chtype *ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int   PDC_CDECL   addchnstr(chtype *ch, int n)
+int   PDC_CDECL   addchnstr(const chtype *ch, int n)
 #else
 int   PDC_CDECL   addchnstr(ch,n)
-chtype *ch;
+const chtype *ch;
 int n;
 #endif
 /***********************************************************************/
@@ -172,11 +172,11 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int   PDC_CDECL   waddchstr(WINDOW *win, chtype *ch)
+int   PDC_CDECL   waddchstr(WINDOW *win, const chtype *ch)
 #else
 int   PDC_CDECL   waddchstr(win,ch)
 WINDOW *win;
-chtype *ch;
+const chtype *ch;
 #endif
 /***********************************************************************/
 {
@@ -191,11 +191,11 @@ chtype *ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int   PDC_CDECL   waddchnstr(WINDOW *win, chtype *ch, int n)
+int   PDC_CDECL   waddchnstr(WINDOW *win, const chtype *ch, int n)
 #else
 int   PDC_CDECL   waddchnstr(win,ch,n)
 WINDOW *win;
-chtype *ch;
+const chtype *ch;
 int n;
 #endif
 /***********************************************************************/
@@ -297,12 +297,12 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int   PDC_CDECL   mvaddchstr(int y, int x, chtype *ch)
+int   PDC_CDECL   mvaddchstr(int y, int x, const chtype *ch)
 #else
 int   PDC_CDECL   mvaddchstr(y,x,ch)
 int y;
 int x;
-chtype *ch;
+const chtype *ch;
 #endif
 /***********************************************************************/
 {
@@ -320,12 +320,12 @@ chtype *ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int   PDC_CDECL   mvaddchnstr(int y, int x, chtype *ch, int n)
+int   PDC_CDECL   mvaddchnstr(int y, int x, const chtype *ch, int n)
 #else
 int   PDC_CDECL   mvaddchnstr(y,x,ch,n)
 int y;
 int x;
-chtype *ch;
+const chtype *ch;
 int n;
 #endif
 /***********************************************************************/
@@ -344,13 +344,13 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int   PDC_CDECL   mvwaddchstr(WINDOW *win, int y, int x, chtype *ch)
+int   PDC_CDECL   mvwaddchstr(WINDOW *win, int y, int x, const chtype *ch)
 #else
 int   PDC_CDECL   mvwaddchstr(win,y,x,ch)
 WINDOW *win;
 int y;
 int x;
-chtype *ch;
+const chtype *ch;
 #endif
 /***********************************************************************/
 {
@@ -368,13 +368,13 @@ chtype *ch;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int   PDC_CDECL   mvwaddchnstr(WINDOW *win,int y, int x, chtype *ch, int n)
+int   PDC_CDECL   mvwaddchnstr(WINDOW *win,int y, int x, const chtype *ch, int n)
 #else
 int   PDC_CDECL   mvwaddchnstr(win,y,x,ch,n)
 WINDOW *win;
 int y;
 int x;
-chtype *ch;
+const chtype *ch;
 int n;
 #endif
 /***********************************************************************/
diff --git a/pdcurses/addstr.c b/pdcurses/addstr.c
index 04d91bf4..ddd0187e 100644
--- a/pdcurses/addstr.c
+++ b/pdcurses/addstr.c
@@ -42,7 +42,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_addstr  = "$Id: addstr.c,v 1.1 2001/01/10 08:26:47 mark Exp $";
+char *rcsid_addstr  = "$Id: addstr.c,v 1.2 2005/11/19 19:07:21 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -50,14 +50,14 @@ char *rcsid_addstr  = "$Id: addstr.c,v 1.1 2001/01/10 08:26:47 mark Exp $";
   Name:                                                        addstr
 
   Synopsis:
-  	int addstr(char *str);
-  	int addnstr(char *str, int n);
-  	int waddstr(WINDOW *win, char *str);
-  	int waddnstr(WINDOW *win, char *str, int n);
-  	int mvaddstr(int y, int x, char *str);
-  	int mvaddnstr(int y, int x, char *str, int n);
-  	int mvwaddstr(WINDOW *, int y, int x, char *str);
-  	int mvwaddnstr(WINDOW *, int y, int x, char *str, int n);
+  	int addstr(const char *str);
+  	int addnstr(const char *str, int n);
+  	int waddstr(WINDOW *win, const char *str);
+  	int waddnstr(WINDOW *win, const char *str, int n);
+  	int mvaddstr(int y, int x, const char *str);
+  	int mvaddnstr(int y, int x, const char *str, int n);
+  	int mvwaddstr(WINDOW *, int y, int x, const char *str);
+  	int mvwaddnstr(WINDOW *, int y, int x, const char *str, int n);
 
   X/Open Description:
  	These routines write all the characters of the null-terminated
@@ -97,10 +97,10 @@ char *rcsid_addstr  = "$Id: addstr.c,v 1.1 2001/01/10 08:26:47 mark Exp $";
 
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	addstr(char *str)
+int	PDC_CDECL	addstr(const char *str)
 #else
 int	PDC_CDECL	addstr(str)
-char *str;
+const char *str;
 #endif
 /***********************************************************************/
 {
@@ -124,10 +124,10 @@ char *str;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	addnstr(char *str, int n)
+int	PDC_CDECL	addnstr(const char *str, int n)
 #else
 int	PDC_CDECL	addnstr(str,n)
-char *str;
+const char *str;
 int n;
 #endif
 /***********************************************************************/
@@ -154,11 +154,11 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	waddstr(WINDOW *win, char *str)
+int	PDC_CDECL	waddstr(WINDOW *win, const char *str)
 #else
 int	PDC_CDECL	waddstr(win,str)
 WINDOW *win;
-char *str;
+const char *str;
 #endif
 /***********************************************************************/
 {
@@ -182,11 +182,11 @@ char *str;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	waddnstr(WINDOW *win, char *str, int n)
+int	PDC_CDECL	waddnstr(WINDOW *win, const char *str, int n)
 #else
 int	PDC_CDECL	waddnstr(win,str,n)
 WINDOW *win;
-char *str;
+const char *str;
 int n;
 #endif
 /***********************************************************************/
@@ -214,12 +214,12 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvaddstr(int y, int x, char *str)
+int	PDC_CDECL	mvaddstr(int y, int x, const char *str)
 #else
 int	PDC_CDECL	mvaddstr(y,x,str)
 int y;
 int x;
-char *str;
+const char *str;
 #endif
 /***********************************************************************/
 {
@@ -246,12 +246,12 @@ char *str;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvaddnstr(int y, int x, char *str, int n)
+int	PDC_CDECL	mvaddnstr(int y, int x, const char *str, int n)
 #else
 int	PDC_CDECL	mvaddnstr(y,x,str,n)
 int y;
 int x;
-char *str;
+const char *str;
 int n;
 #endif
 /***********************************************************************/
@@ -282,13 +282,13 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvwaddstr(WINDOW *win, int y, int x, char *str)
+int	PDC_CDECL	mvwaddstr(WINDOW *win, int y, int x, const char *str)
 #else
 int	PDC_CDECL	mvwaddstr(win,y,x,str)
 WINDOW *win;
 int y;
 int x;
-char *str;
+const char *str;
 #endif
 /***********************************************************************/
 {
@@ -315,13 +315,13 @@ char *str;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvwaddnstr(WINDOW *win,int y, int x, char *str, int n)
+int	PDC_CDECL	mvwaddnstr(WINDOW *win,int y, int x, const char *str, int n)
 #else
 int	PDC_CDECL	mvwaddnstr(win,y,x,str,n)
 WINDOW *win;
 int y;
 int x;
-char *str;
+const char *str;
 int n;
 #endif
 /***********************************************************************/
diff --git a/pdcurses/insstr.c b/pdcurses/insstr.c
index 1dea4e2d..704fea1b 100644
--- a/pdcurses/insstr.c
+++ b/pdcurses/insstr.c
@@ -46,7 +46,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_insstr  = "$Id: insstr.c,v 1.2 2002/03/22 22:36:52 mark Exp $";
+char *rcsid_insstr  = "$Id: insstr.c,v 1.3 2005/11/19 19:07:21 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -54,14 +54,14 @@ char *rcsid_insstr  = "$Id: insstr.c,v 1.2 2002/03/22 22:36:52 mark Exp $";
   Name:                                                        insstr
 
   Synopsis:
-  	int insstr(char *str);
-  	int insnstr(char *str, int n);
-  	int winsstr(WINDOW *win, char *str);
-  	int winsnstr(WINDOW *win, char *str, int n);
-  	int mvinsstr(int y, int x, char *str);
-  	int mvinsnstr(int y, int x, char *str, int n);
-  	int mvwinsstr(WINDOW *, int y, int x, char *str);
-  	int mvwinsnstr(WINDOW *, int y, int x, char *str, int n);
+  	int insstr(const char *str);
+  	int insnstr(const char *str, int n);
+  	int winsstr(WINDOW *win, const char *str);
+  	int winsnstr(WINDOW *win, const char *str, int n);
+  	int mvinsstr(int y, int x, const char *str);
+  	int mvinsnstr(int y, int x, const char *str, int n);
+  	int mvwinsstr(WINDOW *, int y, int x, const char *str);
+  	int mvwinsnstr(WINDOW *, int y, int x, const char *str, int n);
 
   System V Curses Description:
   	With these routines, a character string (as many characters as 
@@ -104,10 +104,10 @@ char *rcsid_insstr  = "$Id: insstr.c,v 1.2 2002/03/22 22:36:52 mark Exp $";
 
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	insstr(char *str)
+int	PDC_CDECL	insstr(const char *str)
 #else
 int	PDC_CDECL	insstr(str)
-char *str;
+const char *str;
 #endif
 /***********************************************************************/
 {
@@ -122,10 +122,10 @@ char *str;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	insnstr(char *str, int n)
+int	PDC_CDECL	insnstr(const char *str, int n)
 #else
 int	PDC_CDECL	insnstr(str,n)
-char *str;
+const char *str;
 int n;
 #endif
 /***********************************************************************/
@@ -141,11 +141,11 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	winsstr(WINDOW *win, char *str)
+int	PDC_CDECL	winsstr(WINDOW *win, const char *str)
 #else
 int	PDC_CDECL	winsstr(win,str)
 WINDOW *win;
-char *str;
+const char *str;
 #endif
 /***********************************************************************/
 {
@@ -160,11 +160,11 @@ char *str;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	winsnstr(WINDOW *win, char *str, int n)
+int	PDC_CDECL	winsnstr(WINDOW *win, const char *str, int n)
 #else
 int	PDC_CDECL	winsnstr(win,str,n)
 WINDOW *win;
-char *str;
+const char *str;
 int n;
 #endif
 /***********************************************************************/
@@ -194,12 +194,12 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvinsstr(int y, int x, char *str)
+int	PDC_CDECL	mvinsstr(int y, int x, const char *str)
 #else
 int	PDC_CDECL	mvinsstr(y,x,str)
 int y;
 int x;
-char *str;
+const char *str;
 #endif
 /***********************************************************************/
 {
@@ -217,12 +217,12 @@ char *str;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvinsnstr(int y, int x, char *str, int n)
+int	PDC_CDECL	mvinsnstr(int y, int x, const char *str, int n)
 #else
 int	PDC_CDECL	mvinsnstr(y,x,str,n)
 int y;
 int x;
-char *str;
+const char *str;
 int n;
 #endif
 /***********************************************************************/
@@ -241,13 +241,13 @@ int n;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvwinsstr(WINDOW *win, int y, int x, char *str)
+int	PDC_CDECL	mvwinsstr(WINDOW *win, int y, int x, const char *str)
 #else
 int	PDC_CDECL	mvwinsstr(win,y,x,str)
 WINDOW *win;
 int y;
 int x;
-char *str;
+const char *str;
 #endif
 /***********************************************************************/
 {
@@ -265,13 +265,13 @@ char *str;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	mvwinsnstr(WINDOW *win,int y, int x, char *str, int n)
+int	PDC_CDECL	mvwinsnstr(WINDOW *win,int y, int x, const char *str, int n)
 #else
 int	PDC_CDECL	mvwinsnstr(win,y,x,str,n)
 WINDOW *win;
 int y;
 int x;
-char *str;
+const char *str;
 int n;
 #endif
 /***********************************************************************/
diff --git a/pdcurses/overlay.c b/pdcurses/overlay.c
index a8b4e613..c641a7f4 100644
--- a/pdcurses/overlay.c
+++ b/pdcurses/overlay.c
@@ -35,7 +35,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_overlay  = "$Id: overlay.c,v 1.1 2001/01/10 08:27:18 mark Exp $";
+char *rcsid_overlay  = "$Id: overlay.c,v 1.2 2005/11/19 19:07:21 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -43,11 +43,11 @@ char *rcsid_overlay  = "$Id: overlay.c,v 1.1 2001/01/10 08:27:18 mark Exp $";
   Name:                                                       overlay
 
   Synopsis:
-  	int	overlay(WINDOW *src_w, WINDOW *dst_w)
-  	int	overwrite(WINDOW *src_w, WINDOW *dst_w)
-  	int	copywin(WINDOW *src_w, WINDOW *dst_w, int src_tr,
-  			int src_tc, int dst_tr, int dst_tc, int dst_br, int dst_bc,
-  			bool overlay)
+  	int	overlay(const WINDOW *src_w, WINDOW *dst_w)
+  	int	overwrite(const WINDOW *src_w, WINDOW *dst_w)
+  	int	copywin(const WINDOW *src_w, WINDOW *dst_w, int src_tr,
+  			int src_tc, int dst_tr, int dst_tc, int dst_br,
+			int dst_bc, bool overlay)
 
   X/Open Description:
  	The overlay() and overwrite() functions overlay src_w on top of 
@@ -99,10 +99,10 @@ char *rcsid_overlay  = "$Id: overlay.c,v 1.1 2001/01/10 08:27:18 mark Exp $";
 
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	overlay(WINDOW *src_w, WINDOW *dst_w)
+int	PDC_CDECL	overlay(const WINDOW *src_w, WINDOW *dst_w)
 #else
 int	PDC_CDECL	overlay(src_w,dst_w)
-WINDOW *src_w;
+const WINDOW *src_w;
 WINDOW *dst_w;
 #endif
 /***********************************************************************/
@@ -168,10 +168,10 @@ WINDOW *dst_w;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	overwrite(WINDOW *src_w, WINDOW *dst_w)
+int	PDC_CDECL	overwrite(const WINDOW *src_w, WINDOW *dst_w)
 #else
 int	PDC_CDECL	overwrite(src_w,dst_w)
-WINDOW *src_w;
+const WINDOW *src_w;
 WINDOW *dst_w;
 #endif
 /***********************************************************************/
@@ -237,11 +237,12 @@ WINDOW *dst_w;
 }
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int	PDC_CDECL	copywin(WINDOW *src_w, WINDOW *dst_w, int src_tr, int src_tc, int dst_tr,
+int	PDC_CDECL	copywin(const WINDOW *src_w, WINDOW *dst_w, 
+	int src_tr, int src_tc, int dst_tr,
 	int dst_tc, int dst_br, int dst_bc, int overlay)
 #else
 int	PDC_CDECL	copywin(src_w,dst_w,src_tr,src_tc,dst_tr,dst_tc,dst_br,dst_bc,overlay)
-WINDOW *src_w;
+const WINDOW *src_w;
 WINDOW *dst_w;
 int src_tr;
 int src_tc;
diff --git a/pdcurses/pdcwin.c b/pdcurses/pdcwin.c
index 4d55d40c..b2b05827 100644
--- a/pdcurses/pdcwin.c
+++ b/pdcurses/pdcwin.c
@@ -36,7 +36,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_PDCwin  = "$Id: pdcwin.c,v 1.5 2005/11/12 20:54:58 wmcbrine Exp $";
+char *rcsid_PDCwin  = "$Id: pdcwin.c,v 1.6 2005/11/19 19:07:21 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -55,7 +55,7 @@ char *rcsid_PDCwin  = "$Id: pdcwin.c,v 1.5 2005/11/12 20:54:58 wmcbrine Exp $";
     ERR is returned if either src or dst windows are NULL;
 
   Portability:
-    PDCurses int   PDC_copy_win( WINDOW* src_w, WINDOW* dst_w
+    PDCurses int   PDC_copy_win( const WINDOW* src_w, WINDOW* dst_w
          int src_tr,int src_tc,int src_br,int src_bc,
          int dst_tr,int dst_tc,int dst_br,int dst_bc,bool overlay);
 
@@ -63,11 +63,11 @@ char *rcsid_PDCwin  = "$Id: pdcwin.c,v 1.5 2005/11/12 20:54:58 wmcbrine Exp $";
 
 /***********************************************************************/
 #ifdef HAVE_PROTO
-int PDC_copy_win(WINDOW *src_w, WINDOW *dst_w,int src_tr,int src_tc,int
+int PDC_copy_win(const WINDOW *src_w, WINDOW *dst_w,int src_tr,int src_tc,int
    src_br,int src_bc,int dst_tr,int dst_tc,int dst_br,int dst_bc,bool overlay)
 #else
 int PDC_copy_win(src_w,dst_w,src_tr,src_tc,src_br,src_bc,dst_tr,dst_tc,dst_br,dst_bc,overlay)
-WINDOW *src_w;
+const WINDOW *src_w;
 WINDOW *dst_w;
 int src_tr;
 int src_tc;
diff --git a/pdcurses/slk.c b/pdcurses/slk.c
index 99adfe68..f5b4711e 100644
--- a/pdcurses/slk.c
+++ b/pdcurses/slk.c
@@ -42,7 +42,7 @@
 #endif
 
 #ifdef PDCDEBUG
-char *rcsid_slk  = "$Id: slk.c,v 1.2 2005/11/12 20:54:58 wmcbrine Exp $";
+char *rcsid_slk  = "$Id: slk.c,v 1.3 2005/11/19 19:07:21 wmcbrine Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -52,7 +52,7 @@ char *rcsid_slk  = "$Id: slk.c,v 1.2 2005/11/12 20:54:58 wmcbrine Exp $";
   Synopsis:
 
   	int slk_init(int fmt);
-  	int slk_set(int labnum, char *label, int fmt);
+  	int slk_set(int labnum, const char *label, int fmt);
   	int slk_refresh(void);
   	int slk_noutrefresh(void);
   	char *slk_label(int labnum);
@@ -213,11 +213,11 @@ int fmt;
    save = 1 yes or 0 no
  */
 #ifdef HAVE_PROTO
-static int PDC_slk_set(int label_num, char *label_str, int label_fmt, int save)
+static int PDC_slk_set(int label_num, const char *label_str, int label_fmt, int save)
 #else
 static int PDC_slk_set(label_num, label_str, label_fmt, save)
 int label_num;
-char *label_str;
+const char *label_str;
 int label_fmt;
 int save;
 #endif
@@ -324,11 +324,11 @@ int col;
       2 = right
  */
 #ifdef HAVE_PROTO
-int PDC_CDECL slk_set(int label_num, char *label_str, int label_fmt)
+int PDC_CDECL slk_set(int label_num, const char *label_str, int label_fmt)
 #else
 int PDC_CDECL slk_set(label_num, label_str, label_fmt)
 int label_num;
-char *label_str;
+const char *label_str;
 int label_fmt;
 #endif
 /***********************************************************************/