ncurses 5.9 - patch 20141101

[ncurses.git] / ncurses / base / lib_mouse.c

diff --git a/ncurses/base/lib_mouse.c b/ncurses/base/lib_mouse.c
index 1b3fa4e51840c42f65a3cf36d0c446ce39b5802b..60bf488c8c6464c619e10ac4244e6a89c1474e20 100644 (file)
--- a/ncurses/base/lib_mouse.c
+++ b/ncurses/base/lib_mouse.c
@@ -84,7 +84,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_mouse.c,v 1.163 2014/10/18 10:32:02 tom Exp $")
+MODULE_ID("$Id: lib_mouse.c,v 1.165 2014/11/01 12:27:59 tom Exp $")

 
 #include <tic.h>
 
 
 #include <tic.h>
 


@@ -432,7 +432,7 @@ enable_xterm_mouse(SCREEN *sp, int enable)
 
 #if USE_GPM_SUPPORT
 static bool
 
 #if USE_GPM_SUPPORT
 static bool

-allow_gpm_mouse(SCREEN *sp)
+allow_gpm_mouse(SCREEN *sp GCC_UNUSED)

 {
     bool result = FALSE;
 
 {
     bool result = FALSE;
 


@@ -446,8 +446,8 @@ allow_gpm_mouse(SCREEN *sp)
 #endif
        /* GPM does printf's without checking if stdout is a terminal */
     if (NC_ISATTY(fileno(stdout))) {
 #endif
        /* GPM does printf's without checking if stdout is a terminal */
     if (NC_ISATTY(fileno(stdout))) {

-       char *list = getenv("NCURSES_GPM_TERMS");
-       char *env = getenv("TERM");
+       const char *list = getenv("NCURSES_GPM_TERMS");
+       const char *env = getenv("TERM");

        if (list != 0) {
            if (env != 0) {
                result = _nc_name_match(list, env, "|:");
        if (list != 0) {
            if (env != 0) {
                result = _nc_name_match(list, env, "|:");


@@ -608,7 +608,7 @@ initialize_mousetype(SCREEN *sp)
            int rc;
 
            if (!sp->_emxmouse_buttons[0]) {
            int rc;
 
            if (!sp->_emxmouse_buttons[0]) {

-               char *s = getenv("MOUSE_BUTTONS_123");
+               const char *s = getenv("MOUSE_BUTTONS_123");

 
                sp->_emxmouse_buttons[0] = 1;
                if (s && strlen(s) >= 3) {
 
                sp->_emxmouse_buttons[0] = 1;
                if (s && strlen(s) >= 3) {