File 0921-Don-t-use-the-false-symbol-as-a-label.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0921-Don-t-use-the-false-symbol-as-a-label.patch of Package erlang (Revision 66a224e208ffe9ee89602bad56a74dfa)

Currently displaying revision 66a224e208ffe9ee89602bad56a74dfa , Show latest

From b13f8979495557f696cad6ad030e9b7e009cc8ad Mon Sep 17 00:00:00 2001
From: Calvin Buckley <calvin@cmpct.info>
Date: Sat, 16 May 2020 20:58:36 +0000
Subject: [PATCH 03/11] Don't use the false symbol as a label

If stdbool is included (Haiku seems to do this) in system headers,
this becomes defined already and is bad juju. Use a unique sym.
---
 erts/emulator/drivers/unix/ttsl_drv.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c
index 2f4301cf9c..05bec288d4 100644
--- a/erts/emulator/drivers/unix/ttsl_drv.c
+++ b/erts/emulator/drivers/unix/ttsl_drv.c
@@ -1325,17 +1325,17 @@ static int start_termcap(void)
 
     capbuf = driver_alloc(1024);
     if (!capbuf)
-	goto false;
+	goto termcap_false;
     eres = erl_drv_getenv("TERM", capbuf, &envsz);
     if (eres == 0)
 	env = capbuf;
     else if (eres < 0) {
         DEBUGLOG(("start_termcap: failure in erl_drv_getenv(\"TERM\", ..) = %d\n", eres));
-	goto false;
+	goto termcap_false;
     } else /* if (eres > 1) */ {
       char *envbuf = driver_alloc(envsz);
       if (!envbuf)
-	  goto false;
+	  goto termcap_false;
       while (1) {
 	  char *newenvbuf;
 	  eres = erl_drv_getenv("TERM", envbuf, &envsz);
@@ -1345,7 +1345,7 @@ static int start_termcap(void)
           if (eres < 0 || !newenvbuf) {
               DEBUGLOG(("start_termcap: failure in erl_drv_getenv(\"TERM\", ..) = %d or realloc buf == %p\n", eres, newenvbuf));
 	      env = newenvbuf ? newenvbuf : envbuf;
-	      goto false;
+	      goto termcap_false;
 	  }
 	  envbuf = newenvbuf;
       }
@@ -1353,7 +1353,7 @@ static int start_termcap(void)
     }
     if ((tres = tgetent((char*)lbuf, env)) <= 0) {
         DEBUGLOG(("start_termcap: failure in tgetent(..) = %d\n", tres));
-        goto false;
+        goto termcap_false;
     }
     if (env != capbuf) {
 	env = NULL;
@@ -1375,7 +1375,7 @@ static int start_termcap(void)
         return TRUE;
     }
     DEBUGLOG(("start_termcap: failed start\n"));
- false:
+ termcap_false:
     if (env && env != capbuf)
 	driver_free(env);
     if (capbuf)
-- 
2.26.2

Places

File 0921-Don-t-use-the-false-symbol-as-a-label.patch of Package erlang (Revision 66a224e208ffe9ee89602bad56a74dfa)

Places