repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 82533fe7faea0a655f7c724f29fb8268b944601a:
path_to: 
revision_to: 

commit 82533fe7faea0a655f7c724f29fb8268b944601a
Author: Marc Lehmann 
Date:   Tue Jun 25 03:35:01 2019 +0000

    *** empty log message ***

diff --git a/Changes b/Changes

--- a/Changes
+++ b/Changes
@@ -68,6 +68,10 @@ TODO: fix ESC G reply forever, or simply completely disable it?
 	  switch to the new bg image interface (see man urxvt-background).
         - expose priv_modes member and constants to perl extensions
           (patch by Rastislav Barlik).
+        - fix a whole slew of const sillyness, unfortunately forced upon
+          us by ISO C++.
+        - update to libecb 0x00010006.
+        - disable all thread support in ecb.h as we presumably don't need it.

 9.22 Sat Jan 23 21:07:33 CET 2016
 	- NOTICE: this release updates terminfo.
diff --git a/src/emman.c b/src/emman.c

--- a/src/emman.c
+++ b/src/emman.c
@@ -1,5 +1,6 @@
 /* enable mremap on GNU/Linux */
 #ifdef __linux__
+# undef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif

diff --git a/src/ev_cpp.h b/src/ev_cpp.h

--- a/src/ev_cpp.h
+++ b/src/ev_cpp.h
@@ -1,8 +1,11 @@
+#define ECB_NO_THREADS 1
+
 #define EV_COMPAT3 0
 #define EV_USE_SELECT 1
 #define EV_USE_EPOLL 1
 #define EV_USE_KQUEUE 1
 #define EV_USE_PORT 1
+//#define EV_USE_LINUXAIO 1
 #define EV_PREPARE_ENABLE 1
 #define EV_IDLE_ENABLE 1
 #define EV_SIGNAL_ENABLE 1
diff --git a/src/init.C b/src/init.C

--- a/src/init.C
+++ b/src/init.C
@@ -975,9 +975,9 @@ rxvt_term::init_env ()
 #endif

   if (depth <= 2)
-    putenv ("COLORTERM=" COLORTERMENV "-mono");
+    putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
   else
-    putenv ("COLORTERM=" COLORTERMENVFULL);
+    putenv ((char *)"COLORTERM=" COLORTERMENVFULL);

   if (rs[Rs_term_name] != NULL)
     {
@@ -986,7 +986,7 @@ rxvt_term::init_env ()
       putenv (env_term);
     }
   else
-    putenv ("TERM=" TERMENV);
+    putenv ((char *)"TERM=" TERMENV);

 #ifdef HAVE_UNSETENV
   /* avoid passing old settings and confusing term size */
@@ -1015,7 +1015,7 @@ rxvt_term::set_locale (const char *locale)
       else
         rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");

-      this->locale = "C";
+      this->locale = (char *)"C"; /* strdup'ed below */
     }


diff --git a/src/rxvt.h b/src/rxvt.h

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -80,7 +80,9 @@ typedef  int32_t tlen_t_; // specifically for use in the line_t structure
 # define HAVE_IMG 1
 #endif

-#include 
+#define ECB_NO_THREADS 1
+#include "ecb.h"
+
 #include "encoding.h"
 #include "rxvtutil.h"
 #include "rxvtfont.h"
diff --git a/src/rxvtdaemon.C b/src/rxvtdaemon.C

--- a/src/rxvtdaemon.C
+++ b/src/rxvtdaemon.C
@@ -36,7 +36,7 @@
 char *rxvt_connection::unix_sockname ()
 {
   char name[PATH_MAX];
-  char *path = getenv ("RXVT_SOCKET");
+  const char *path = getenv ("RXVT_SOCKET");

   if (!path)
     {
diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs

--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -393,7 +393,7 @@ rxvt_perl_interp::init ()
         perl_environ = rxvt_environ;
         localise_env set_environ (perl_environ);

-        char *args[] = {
+        const char *args[] = {
           "",
           "-e"
           "BEGIN {"
@@ -405,7 +405,7 @@ rxvt_perl_interp::init ()
           0
         };
         int argc = ecb_array_length (args) - 1;
-        char **argv = args;
+        char **argv = (char **)args;

         PERL_SYS_INIT3 (&argc, &argv, &environ);
         perl = perl_alloc ();
@@ -1834,7 +1834,7 @@ rxvt_term::_resource (octet_string name, int index, SV *newval = 0)
         else
           {
             --rs;
-            name = "";
+            name = (octet_string)"";
           }

         if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
diff --git a/src/rxvtutil.h b/src/rxvtutil.h

--- a/src/rxvtutil.h
+++ b/src/rxvtutil.h
@@ -3,7 +3,10 @@

 #include 
 #include 
+
+#define ECB_NO_THREADS 1
 #include "ecb.h"
+
 #include "estl.h"

 #include "emman.h"
diff --git a/src/screen.C b/src/screen.C

--- a/src/screen.C
+++ b/src/screen.C
@@ -3502,7 +3502,7 @@ rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
         }
       else
         {
-          cl = L"";
+          cl = (wchar_t *)L"";
           selectlen = 0;
         }

-----END OF PAGE-----