master build broken on macOS

master build broken on macOS

[Filipp Gunbin]

With these errors.

  CC       keymap.o
keymap.c:135:33: error: passing 'Lisp_Object' (aka 'struct Lisp_Object') to parameter of incompatible type 'bool'
                   intern_c_string (defname), Qnil);
                                              ^~~~
./globals.h:6463:14: note: expanded from macro 'Qnil'
#define Qnil builtin_lisp_symbol (0)
             ^~~~~~~~~~~~~~~~~~~~~~~
keymap.c:77:13: note: passing argument to parameter here
                                    bool);
                                        ^
keymap.c:1444:36: error: passing 'Lisp_Object' (aka 'struct Lisp_Object') to parameter of incompatible type 'bool'
  store_in_keymap (keymap, c, cmd, Qnil);
                                   ^~~~
./globals.h:6463:14: note: expanded from macro 'Qnil'
#define Qnil builtin_lisp_symbol (0)
             ^~~~~~~~~~~~~~~~~~~~~~~
keymap.c:735:26: note: passing argument to parameter 'remove' here
                 Lisp_Object def, bool remove)
                                       ^
2 errors generated.
make[2]: *** [Makefile:390: keymap.o] Error 1

Re: master build broken on macOS

[Po Lu]

Filipp Gunbin <fgunbin@fastmail.fm> writes:

> With these errors.
>
>   CC       keymap.o
> keymap.c:135:33: error: passing 'Lisp_Object' (aka 'struct Lisp_Object') to parameter of incompatible type 'bool'
>                    intern_c_string (defname), Qnil);
>                                               ^~~~
> ./globals.h:6463:14: note: expanded from macro 'Qnil'
> #define Qnil builtin_lisp_symbol (0)
>              ^~~~~~~~~~~~~~~~~~~~~~~
> keymap.c:77:13: note: passing argument to parameter here
>                                     bool);
>                                         ^
> keymap.c:1444:36: error: passing 'Lisp_Object' (aka 'struct Lisp_Object') to parameter of incompatible type 'bool'
>   store_in_keymap (keymap, c, cmd, Qnil);
>                                    ^~~~
> ./globals.h:6463:14: note: expanded from macro 'Qnil'
> #define Qnil builtin_lisp_symbol (0)
>              ^~~~~~~~~~~~~~~~~~~~~~~
> keymap.c:735:26: note: passing argument to parameter 'remove' here
>                  Lisp_Object def, bool remove)
>                                        ^
> 2 errors generated.
> make[2]: *** [Makefile:390: keymap.o] Error 1

Also fails here on GNU/Linux, with Lisp object type checking.

Re: master build broken on macOS

[Lars Ingebrigtsen]

Po Lu <luangruo@yahoo.com> writes:

> Also fails here on GNU/Linux, with Lisp object type checking.

Yup.  Should be fixed now.

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

master build broken on macOS

[Filipp Gunbin]

window.c:1021:11: error: invalid operands to binary expression ('Lisp_Object' (aka 'struct Lisp_Object') and 'Lisp_Object')
    (unit == Qremap ? WINDOW_BODY_IN_REMAPPED_CHARS
     ~~~~ ^  ~~~~~~
1 error generated.


commit 43f8690ebf3439af90cf72c619e75afb4cff1a83
Author: Jim Porter <jporterbugs@gmail.com>
Date:   Thu Jun 2 21:12:04 2022 -0700

Thanks.

Re: master build broken on macOS

[Jim Porter]

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

On 6/9/2022 7:53 AM, Filipp Gunbin wrote:
> window.c:1021:11: error: invalid operands to binary expression ('Lisp_Object' (aka 'struct Lisp_Object') and 'Lisp_Object')
>      (unit == Qremap ? WINDOW_BODY_IN_REMAPPED_CHARS
>       ~~~~ ^  ~~~~~~
> 1 error generated.

Oops. I think this should do the trick?

[-- Attachment #2: 0001-src-window.c-window_body_unit_from_symbol-Use-EQ-ins.patch --]
[-- Type: text/plain, Size: 793 bytes --]

From 3e68b0b22e518e55167ee70425ac0ff97efa35e1 Mon Sep 17 00:00:00 2001
From: Jim Porter <jporterbugs@gmail.com>
Date: Thu, 9 Jun 2022 08:47:42 -0700
Subject: [PATCH] ; * src/window.c (window_body_unit_from_symbol): Use 'EQ'
 instead of ==.

---
 src/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/window.c b/src/window.c
index e5666ce38e..dae9a29387 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1018,7 +1018,7 @@ DEFUN ("window-top-line", Fwindow_top_line, Swindow_top_line, 0, 1, 0,
 window_body_unit_from_symbol (Lisp_Object unit)
 {
   return
-    (unit == Qremap ? WINDOW_BODY_IN_REMAPPED_CHARS
+    (EQ (unit, Qremap) ? WINDOW_BODY_IN_REMAPPED_CHARS
      : NILP (unit) ? WINDOW_BODY_IN_CANONICAL_CHARS
      : WINDOW_BODY_IN_PIXELS);
 }
-- 
2.25.1

Re: master build broken on macOS

[Eli Zaretskii]

> From: Jim Porter <jporterbugs@gmail.com>
> Date: Thu, 9 Jun 2022 08:49:56 -0700
> 
> On 6/9/2022 7:53 AM, Filipp Gunbin wrote:
> > window.c:1021:11: error: invalid operands to binary expression ('Lisp_Object' (aka 'struct Lisp_Object') and 'Lisp_Object')
> >      (unit == Qremap ? WINDOW_BODY_IN_REMAPPED_CHARS
> >       ~~~~ ^  ~~~~~~
> > 1 error generated.
> 
> Oops. I think this should do the trick?

Yes, already done.

Thanks.

Re: master build broken on macOS

[Eli Zaretskii]

> From: Filipp Gunbin <fgunbin@fastmail.fm>
> Date: Thu, 09 Jun 2022 17:53:27 +0300
> 
> window.c:1021:11: error: invalid operands to binary expression ('Lisp_Object' (aka 'struct Lisp_Object') and 'Lisp_Object')
>     (unit == Qremap ? WINDOW_BODY_IN_REMAPPED_CHARS
>      ~~~~ ^  ~~~~~~
> 1 error generated.

Thanks, should be fixed now.

Re: master build broken on macOS

[Filipp Gunbin]

On 09/06/2022 19:41 +0300, Eli Zaretskii wrote:

>> From: Filipp Gunbin <fgunbin@fastmail.fm>
>> Date: Thu, 09 Jun 2022 17:53:27 +0300
>> 
>> window.c:1021:11: error: invalid operands to binary expression ('Lisp_Object' (aka 'struct Lisp_Object') and 'Lisp_Object')
>>     (unit == Qremap ? WINDOW_BODY_IN_REMAPPED_CHARS
>>      ~~~~ ^  ~~~~~~
>> 1 error generated.
>
> Thanks, should be fixed now.

Builds now, thank you.