* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change [not found] ` <20190416165207.442F52068F@vcs0.savannah.gnu.org> @ 2019-04-16 17:05 ` Robert Pluim 2019-04-16 17:18 ` Alex Gramiak 0 siblings, 1 reply; 13+ messages in thread From: Robert Pluim @ 2019-04-16 17:05 UTC (permalink / raw) To: emacs-devel; +Cc: Alexander Gramiak >>>>> On Tue, 16 Apr 2019 12:52:07 -0400 (EDT), agrambot@gmail.com (Alexander Gramiak) said: Alexander> branch: scratch/x_emacs commit Alexander> d2df8262387e93d45b8a3f3784c9b9f82836d4fe Author: Alexander> Alexander Gramiak <agrambot@gmail.com> Commit: Alexander> Alexander Gramiak <agrambot@gmail.com> Alexander> fixup! Revert x_frame_parameter -> Alexander> frame_parameter_pos change --- src/frame.c | 2 +- 1 Alexander> file changed, 1 insertion(+), 1 deletion(-) That fixed one compilation error I had, but: CC xdisp.o xdisp.c:29300:37: error: no member named 'x_highlight_frame' in 'struct ns_display_info'; did you mean 'ns_highlight_frame'? || f != FRAME_DISPLAY_INFO (f)->x_highlight_frame) ^~~~~~~~~~~~~~~~~ ns_highlight_frame ./nsterm.h:884:17: note: 'ns_highlight_frame' declared here struct frame *ns_highlight_frame; ^ 1 error generated. (on macOS) Robert ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-16 17:05 ` scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change Robert Pluim @ 2019-04-16 17:18 ` Alex Gramiak 2019-04-16 18:05 ` Eli Zaretskii 2019-04-17 8:24 ` Robert Pluim 0 siblings, 2 replies; 13+ messages in thread From: Alex Gramiak @ 2019-04-16 17:18 UTC (permalink / raw) To: emacs-devel Robert Pluim <rpluim@gmail.com> writes: > CC xdisp.o > xdisp.c:29300:37: error: no member named 'x_highlight_frame' in > 'struct ns_display_info'; did you mean 'ns_highlight_frame'? > || f != FRAME_DISPLAY_INFO (f)->x_highlight_frame) > ^~~~~~~~~~~~~~~~~ > ns_highlight_frame > ./nsterm.h:884:17: note: 'ns_highlight_frame' declared here > struct frame *ns_highlight_frame; > ^ > 1 error generated. > > (on macOS) Ah, I originally renamed the x_highlight_frame on W32/NS to {w32,ns}_*, but decided against it since xdisp.c used the attribute directly (a hook or union interface could be added later). Perhaps it should be renamed native_highlight_frame until then, though. I pushed the fix, do you get any other errors/warnings on macOS? Thanks for testing. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-16 17:18 ` Alex Gramiak @ 2019-04-16 18:05 ` Eli Zaretskii 2019-04-17 14:15 ` Alex Gramiak 2019-04-17 8:24 ` Robert Pluim 1 sibling, 1 reply; 13+ messages in thread From: Eli Zaretskii @ 2019-04-16 18:05 UTC (permalink / raw) To: Alex Gramiak; +Cc: emacs-devel > From: Alex Gramiak <agrambot@gmail.com> > Date: Tue, 16 Apr 2019 11:18:21 -0600 > > Robert Pluim <rpluim@gmail.com> writes: > > > CC xdisp.o > > xdisp.c:29300:37: error: no member named 'x_highlight_frame' in > > 'struct ns_display_info'; did you mean 'ns_highlight_frame'? > > || f != FRAME_DISPLAY_INFO (f)->x_highlight_frame) > > ^~~~~~~~~~~~~~~~~ > > ns_highlight_frame > > ./nsterm.h:884:17: note: 'ns_highlight_frame' declared here > > struct frame *ns_highlight_frame; > > ^ > > 1 error generated. > > > > (on macOS) > > Ah, I originally renamed the x_highlight_frame on W32/NS to {w32,ns}_*, > but decided against it since xdisp.c used the attribute directly (a hook > or union interface could be added later). Perhaps it should be renamed > native_highlight_frame until then, though. Or just highlight_frame? ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-16 18:05 ` Eli Zaretskii @ 2019-04-17 14:15 ` Alex Gramiak 0 siblings, 0 replies; 13+ messages in thread From: Alex Gramiak @ 2019-04-17 14:15 UTC (permalink / raw) To: Eli Zaretskii; +Cc: emacs-devel Eli Zaretskii <eliz@gnu.org> writes: >> Ah, I originally renamed the x_highlight_frame on W32/NS to {w32,ns}_*, >> but decided against it since xdisp.c used the attribute directly (a hook >> or union interface could be added later). Perhaps it should be renamed >> native_highlight_frame until then, though. > > Or just highlight_frame? Yeah, that's better. I pushed a commit changing the name to highlight_frame instead. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-16 17:18 ` Alex Gramiak 2019-04-16 18:05 ` Eli Zaretskii @ 2019-04-17 8:24 ` Robert Pluim 2019-04-17 14:12 ` Alex Gramiak 1 sibling, 1 reply; 13+ messages in thread From: Robert Pluim @ 2019-04-17 8:24 UTC (permalink / raw) To: Alex Gramiak; +Cc: emacs-devel >>>>> On Tue, 16 Apr 2019 11:18:21 -0600, Alex Gramiak <agrambot@gmail.com> said: Alex> Robert Pluim <rpluim@gmail.com> writes: >> CC xdisp.o xdisp.c:29300:37: error: no member named >> 'x_highlight_frame' in 'struct ns_display_info'; did you mean >> 'ns_highlight_frame'? || f != FRAME_DISPLAY_INFO >> (f)->x_highlight_frame) ^~~~~~~~~~~~~~~~~ ns_highlight_frame >> ./nsterm.h:884:17: note: 'ns_highlight_frame' declared here >> struct frame *ns_highlight_frame; ^ 1 error generated. >> >> (on macOS) Alex> Ah, I originally renamed the x_highlight_frame on W32/NS to Alex> {w32,ns}_*, but decided against it since xdisp.c used the Alex> attribute directly (a hook or union interface could be added Alex> later). Perhaps it should be renamed native_highlight_frame Alex> until then, though. Alex> I pushed the fix, do you get any other errors/warnings on Alex> macOS? nsterm.m:2400:1: error: conflicting types for 'ns_query_color' ns_query_color(void *col, XColor *color_def, bool setPixel) ^ ./nsterm.h:1146:1: note: previous declaration is here ns_query_color (void *col, XColor *color_def, int setPixel); ^ CC nsfns.o nsfns.m:1389:4: warning: implicit declaration of function 'x_make_frame_visible' is invalid in C99 [-Wimplicit-function-declaration] x_make_frame_visible (f); CC nsimage.o nsimage.m:196:11: warning: implicit declaration of function 'x_find_image_file' is invalid in C99 [-Wimplicit-function-declaration] found = x_find_image_file (file); ^ nsimage.m:196:9: warning: incompatible integer to pointer conversion assigning to 'Lisp_Object' (aka 'union Lisp_X *') from 'int' [-Wint-conversion] found = x_find_image_file (file); Robert ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-17 8:24 ` Robert Pluim @ 2019-04-17 14:12 ` Alex Gramiak 2019-04-17 14:29 ` Robert Pluim 0 siblings, 1 reply; 13+ messages in thread From: Alex Gramiak @ 2019-04-17 14:12 UTC (permalink / raw) To: emacs-devel Robert Pluim <rpluim@gmail.com> writes: > nsterm.m:2400:1: error: conflicting types for 'ns_query_color' > ns_query_color(void *col, XColor *color_def, bool setPixel) > ^ > ./nsterm.h:1146:1: note: previous declaration is here > ns_query_color (void *col, XColor *color_def, int setPixel); > ^ > > CC nsfns.o > nsfns.m:1389:4: warning: implicit declaration of function 'x_make_frame_visible' > is invalid in C99 [-Wimplicit-function-declaration] > x_make_frame_visible (f); > > CC nsimage.o > nsimage.m:196:11: warning: implicit declaration of function 'x_find_image_file' > is invalid in C99 [-Wimplicit-function-declaration] > found = x_find_image_file (file); > ^ > nsimage.m:196:9: warning: incompatible integer to pointer conversion assigning > to 'Lisp_Object' (aka 'union Lisp_X *') from 'int' [-Wint-conversion] > found = x_find_image_file (file); > > Robert I pushed fixes for these, thanks. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-17 14:12 ` Alex Gramiak @ 2019-04-17 14:29 ` Robert Pluim 2019-04-17 14:40 ` Alex Gramiak 0 siblings, 1 reply; 13+ messages in thread From: Robert Pluim @ 2019-04-17 14:29 UTC (permalink / raw) To: Alex Gramiak; +Cc: emacs-devel >>>>> On Wed, 17 Apr 2019 08:12:26 -0600, Alex Gramiak <agrambot@gmail.com> said: Alex> I pushed fixes for these, thanks. CCLD temacs Undefined symbols for architecture x86_64: "_gui_destroy_all_bitmaps", referenced from: _ns_delete_terminal in nsterm.o ld: symbol(s) not found for architecture x86_64 image.c and xterm.c call it image_destroy_all_bitmaps, w32fns.c calls it x_destroy_all_bitmaps. Robert ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-17 14:29 ` Robert Pluim @ 2019-04-17 14:40 ` Alex Gramiak 2019-04-17 14:59 ` Robert Pluim 0 siblings, 1 reply; 13+ messages in thread From: Alex Gramiak @ 2019-04-17 14:40 UTC (permalink / raw) To: emacs-devel Robert Pluim <rpluim@gmail.com> writes: >>>>>> On Wed, 17 Apr 2019 08:12:26 -0600, Alex Gramiak <agrambot@gmail.com> said: > > Alex> I pushed fixes for these, thanks. > > CCLD temacs > Undefined symbols for architecture x86_64: > "_gui_destroy_all_bitmaps", referenced from: > _ns_delete_terminal in nsterm.o > ld: symbol(s) not found for architecture x86_64 > > image.c and xterm.c call it image_destroy_all_bitmaps, w32fns.c calls > it x_destroy_all_bitmaps. > > Robert image_* is the correct one, thanks. I pushed a fix for both. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-17 14:40 ` Alex Gramiak @ 2019-04-17 14:59 ` Robert Pluim 2019-04-17 15:09 ` Robert Pluim 0 siblings, 1 reply; 13+ messages in thread From: Robert Pluim @ 2019-04-17 14:59 UTC (permalink / raw) To: Alex Gramiak; +Cc: emacs-devel >>>>> On Wed, 17 Apr 2019 08:40:25 -0600, Alex Gramiak <agrambot@gmail.com> said: Alex> Robert Pluim <rpluim@gmail.com> writes: >>>>>>> On Wed, 17 Apr 2019 08:12:26 -0600, Alex Gramiak >>>>>>> <agrambot@gmail.com> said: >> Alex> I pushed fixes for these, thanks. >> >> CCLD temacs Undefined symbols for architecture x86_64: >> "_gui_destroy_all_bitmaps", referenced from: >> _ns_delete_terminal in nsterm.o ld: symbol(s) not found for >> architecture x86_64 >> >> image.c and xterm.c call it image_destroy_all_bitmaps, w32fns.c >> calls it x_destroy_all_bitmaps. >> >> Robert Alex> image_* is the correct one, thanks. I pushed a fix for both. Now it builds and runs. I haven't tried on Ubuntu, but will do that later. Robert ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-17 14:59 ` Robert Pluim @ 2019-04-17 15:09 ` Robert Pluim 2019-04-17 15:39 ` Alex Gramiak 0 siblings, 1 reply; 13+ messages in thread From: Robert Pluim @ 2019-04-17 15:09 UTC (permalink / raw) To: emacs-devel >>>>> On Wed, 17 Apr 2019 16:59:20 +0200, Robert Pluim <rpluim@gmail.com> said: >>>>> On Wed, 17 Apr 2019 08:40:25 -0600, Alex Gramiak <agrambot@gmail.com> said: Alex> Robert Pluim <rpluim@gmail.com> writes: >>>>>>>> On Wed, 17 Apr 2019 08:12:26 -0600, Alex Gramiak >>>>>>>> <agrambot@gmail.com> said: >>> Alex> I pushed fixes for these, thanks. >>> >>> CCLD temacs Undefined symbols for architecture x86_64: >>> "_gui_destroy_all_bitmaps", referenced from: >>> _ns_delete_terminal in nsterm.o ld: symbol(s) not found for >>> architecture x86_64 >>> >>> image.c and xterm.c call it image_destroy_all_bitmaps, >>> w32fns.c calls it x_destroy_all_bitmaps. >>> >>> Robert Alex> image_* is the correct one, thanks. I pushed a fix for both. Robert> Now it builds and runs. I haven't tried on Ubuntu, but Robert> will do that later. Although building on macOS '--with-x=no --with-ns=no' gives the same kind of errors as on emba, eg <https://emba.gnu.org/emacs/emacs/-/jobs/1399/raw> because clear_under_internal_border depends on HAVE_WINDOW_SYSTEM xdisp.c:11595:34: error: no member named 'clear_under_internal_border' in 'struct redisplay_interface' if (FRAME_RIF (f)->clear_under_internal_border) ~~~~~~~~~~~~~ ^ xdisp.c:11596:32: error: no member named 'clear_under_internal_border' in 'struct redisplay_interface' FRAME_RIF (f)->clear_under_internal_border (f); ~~~~~~~~~~~~~ ^ xdisp.c:11666:34: error: no member named 'clear_under_internal_border' in 'struct redisplay_interface' if (FRAME_RIF (f)->clear_under_internal_border) ~~~~~~~~~~~~~ ^ xdisp.c:11667:32: error: no member named 'clear_under_internal_border' in 'struct redisplay_interface' FRAME_RIF (f)->clear_under_internal_border (f); ~~~~~~~~~~~~~ ^ xdisp.c:14491:38: error: no member named 'clear_under_internal_border' in 'struct redisplay_interface' if (FRAME_RIF (f)->clear_under_internal_border) ~~~~~~~~~~~~~ ^ xdisp.c:14492:36: error: no member named 'clear_under_internal_border' in 'struct redisplay_interface' FRAME_RIF (f)->clear_under_internal_border (f); ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-17 15:09 ` Robert Pluim @ 2019-04-17 15:39 ` Alex Gramiak 2019-04-17 15:46 ` Robert Pluim 0 siblings, 1 reply; 13+ messages in thread From: Alex Gramiak @ 2019-04-17 15:39 UTC (permalink / raw) To: emacs-devel Robert Pluim <rpluim@gmail.com> writes: > Although building on macOS '--with-x=no --with-ns=no' gives the same > kind of errors as on emba, eg <https://emba.gnu.org/emacs/emacs/-/jobs/1399/raw> > > because clear_under_internal_border depends on HAVE_WINDOW_SYSTEM Fixed, thanks. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-17 15:39 ` Alex Gramiak @ 2019-04-17 15:46 ` Robert Pluim 2019-04-18 21:03 ` Alex Gramiak 0 siblings, 1 reply; 13+ messages in thread From: Robert Pluim @ 2019-04-17 15:46 UTC (permalink / raw) To: Alex Gramiak; +Cc: emacs-devel >>>>> On Wed, 17 Apr 2019 09:39:15 -0600, Alex Gramiak <agrambot@gmail.com> said: Alex> Robert Pluim <rpluim@gmail.com> writes: >> Although building on macOS '--with-x=no --with-ns=no' gives the >> same kind of errors as on emba, eg >> <https://emba.gnu.org/emacs/emacs/-/jobs/1399/raw> >> >> because clear_under_internal_border depends on >> HAVE_WINDOW_SYSTEM Alex> Fixed, thanks. Indeed. Thanks for the quick turnaround. Iʼll check Ubuntu tonight. I assume youʼre going to squash the branch when you merge it to master? Robert ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change 2019-04-17 15:46 ` Robert Pluim @ 2019-04-18 21:03 ` Alex Gramiak 0 siblings, 0 replies; 13+ messages in thread From: Alex Gramiak @ 2019-04-18 21:03 UTC (permalink / raw) To: emacs-devel Robert Pluim <rpluim@gmail.com> writes: > Indeed. Thanks for the quick turnaround. Iʼll check Ubuntu tonight. > > I assume youʼre going to squash the branch when you merge it to master? I plan to fixup the fixup! commits and squash some of the other ones to get 3-5 commits or so. ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-04-18 21:03 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <20190416165204.7024.23185@vcs0.savannah.gnu.org> [not found] ` <20190416165207.442F52068F@vcs0.savannah.gnu.org> 2019-04-16 17:05 ` scratch/x_emacs d2df826 5/5: fixup! Revert x_frame_parameter -> frame_parameter_pos change Robert Pluim 2019-04-16 17:18 ` Alex Gramiak 2019-04-16 18:05 ` Eli Zaretskii 2019-04-17 14:15 ` Alex Gramiak 2019-04-17 8:24 ` Robert Pluim 2019-04-17 14:12 ` Alex Gramiak 2019-04-17 14:29 ` Robert Pluim 2019-04-17 14:40 ` Alex Gramiak 2019-04-17 14:59 ` Robert Pluim 2019-04-17 15:09 ` Robert Pluim 2019-04-17 15:39 ` Alex Gramiak 2019-04-17 15:46 ` Robert Pluim 2019-04-18 21:03 ` Alex Gramiak
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/emacs.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).