bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Torsten Bronger]

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]


Since commit ec35e2621a9457, using --with-x-toolkit=no with
"./configure" leads to:

Activate.c: In function ‘XMenuActivate’:
Activate.c:618:3: error: ‘FALLTHROUGH’ undeclared (first use in this function)
  618 |   FALLTHROUGH;
      |   ^~~~~~~~~~~


Configured using:
 'configure --prefix=/usr/ --mandir=/usr/share/man/
 --infodir=/usr/share/info/ --with-x-toolkit=no --without-makeinfo
 --with-xpm --with-jpeg --with-tiff --with-gif --with-png --with-x
 --with-file-notification=inotify'


-- 
Torsten Bronger

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4913 bytes --]

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Lars Ingebrigtsen]

Torsten Bronger <bronger@physik.rwth-aachen.de> writes:

> Since commit ec35e2621a9457, using --with-x-toolkit=no with
> "./configure" leads to:
>
> Activate.c: In function ‘XMenuActivate’:
> Activate.c:618:3: error: ‘FALLTHROUGH’ undeclared (first use in this function)
>   618 |   FALLTHROUGH;
>       |   ^~~~~~~~~~~

Adding Paul to the CCs since ec35e2621a9457 was his.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 79 bytes --]

I installed the attached further patch, which should fix this in a 
better way.

[-- Attachment #2: 0001-Another-fix-for-the-no-toolkit-build.patch --]
[-- Type: text/x-patch, Size: 1540 bytes --]

From adc6e855c19a7c9da6aa37c32710e67e4bff97b6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 14 Mar 2022 13:14:23 -0700
Subject: [PATCH] Another fix for the no-toolkit build

This should be better in the long run.
* oldXMenu/Activate.c (XMenuActivate): Revert previous change,
eliminating the goto it introduced.
* oldXMenu/XMenuInt.h: Include <attribute.h>, for FALLTHROUGH.
---
 oldXMenu/Activate.c | 7 ++-----
 oldXMenu/XMenuInt.h | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 410782e60a..e679c2ffed 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -615,8 +615,8 @@ XMenuActivate(
 						   event.xbutton.window
 						   );
 		if (event_xmp != NULL) continue;
-
-	queue:
+		FALLTHROUGH;
+	    default:
 		/*
 		 * This is a foreign event.
 		 * Queue it for later return to the X event queue.
@@ -629,9 +629,6 @@ XMenuActivate(
 		feq_tmp->event = event;
 		feq_tmp->next = feq;
 		feq = feq_tmp;
-		break;
-	    default:
-		goto queue;
 	    }
     }
     /*
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index 86b8e057cd..5d5365ad8f 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -37,6 +37,8 @@ #define _XMenuInternal_h_
 
 #include <config.h>
 
+#include <attribute.h>
+
 /* Avoid warnings about redefining NULL by including <stdio.h> first;
    the other file which wants to define it (<stddef.h> on Ultrix
    systems) can deal if NULL is already defined, but <stdio.h> can't.  */
-- 
2.35.1

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Paul Eggert <eggert@cs.ucla.edu> writes:

>  #include <config.h>
>  
> +#include <attribute.h>
> +
>  /* Avoid warnings about redefining NULL by including <stdio.h> first;
>     the other file which wants to define it (<stddef.h> on Ultrix
>     systems) can deal if NULL is already defined, but <stdio.h> can't.  */

I would rather not bring any more includes into oldXMenu, so maybe keep
it as-is?

Thanks.

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Paul Eggert]

On 3/14/22 17:29, Po Lu wrote:
> I would rather not bring any more includes into oldXMenu

That file had been included into oldXMenu for quite some time, it's just 
that it was included more indirectly (via config.h). So this isn't 
really a new include.

Is the idea to minimize the differences between oldXMenu and some 
ancient version of the X library? If so, that ship sailed a long time 
ago, as we've already installed several trivial porting changes like this.

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Paul Eggert <eggert@cs.ucla.edu> writes:

> That file had been included into oldXMenu for quite some time, it's
> just that it was included more indirectly (via config.h). So this
> isn't really a new include.

Ah okay, I'm happy then.  Thanks for explaining.

> Is the idea to minimize the differences between oldXMenu and some
> ancient version of the X library? If so, that ship sailed a long time
> ago, as we've already installed several trivial porting changes like
> this.

No, not really.  If the file has always been included, then I see no
harm in adding it now.

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Torsten Bronger <bronger@physik.rwth-aachen.de> writes:

> Since commit ec35e2621a9457, using --with-x-toolkit=no with
> "./configure" leads to:
>
> Activate.c: In function ‘XMenuActivate’:
> Activate.c:618:3: error: ‘FALLTHROUGH’ undeclared (first use in this function)
>   618 |   FALLTHROUGH;
>       |   ^~~~~~~~~~~

Thanks, I will look into this, right after I fix the Xt build bug with
non-specified positions.

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Po Lu <luangruo@yahoo.com> writes:

> Thanks, I will look into this, right after I fix the Xt build bug with
> non-specified positions.

Should be fixed now.

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Torsten Bronger]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

Hallöchen!

Po Lu schreibt:

> Po Lu <luangruo@yahoo.com> writes:
>
>> Thanks, I will look into this, right after I fix the Xt build bug
>> with non-specified positions.
>
> Should be fixed now.

Yes, I can confirm this.  Thank you!

Regards,
Torsten.

-- 
Torsten Bronger

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4913 bytes --]

bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors]

Torsten Bronger <bronger@physik.rwth-aachen.de> writes:

> Yes, I can confirm this.  Thank you!

Thanks, I'm closing this bug then.