Menu

Git Repository Merge Request #28: term/post.trm: unbreak !HAVE_DEFLATE_ENCODER builds (merged)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Peter Korsgaard wants to merge 1 commit from /u/peter-korsgaard/gnuplot/ to branch-5-4-stable, 2023-10-01

Commit 2f2cf617808 (post: handle RGBA images (only current use is to render
a pixmap)) added an extra '}' outside the HAVE_DEFLATE_ENCODER (gd support)
conditional, leading to build breakage:

In file included from term.h:298,
                 from term.c:1211:
../term/post.trm:4016:11: error: expected declaration specifiers or '...' before string constant
 4016 |     fputs("%%%%BeginImage\n", gppsfile);

http://autobuild.buildroot.net/results/5676609b6331b645f2e557aca67afe4c3a087433/build-end.log

Fix it by dropping the extra { } added by the above commit.
Commit Date  
[84002a] (unbreak-without-deflate-encoder) by Peter Korsgaard Peter Korsgaard

term/post.trm: unbreak !HAVE_DEFLATE_ENCODER builds

Commit 2f2cf617808 (post: handle RGBA images (only current use is to render
a pixmap)) added an extra '}' outside the HAVE_DEFLATE_ENCODER (gd support)
conditional, leading to build breakage:

In file included from term.h:298,
from term.c:1211:
../term/post.trm:4016:11: error: expected declaration specifiers or '...' before string constant
4016 | fputs("%%%%BeginImage\n", gppsfile);

http://autobuild.buildroot.net/results/5676609b6331b645f2e557aca67afe4c3a087433/build-end.log

Fix it by dropping the extra { } added by the above commit.

Signed-off-by: Peter Korsgaard <peter@...>

2023-10-01 08:20:31 Tree

Discussion

  • Ethan Merritt

    Ethan Merritt - 2023-10-01

    Applied to 6.0rc3 and 6.1 also

     
  • Ethan Merritt

    Ethan Merritt - 2023-10-01
    • Status: open --> merged
     

Log in to post a comment.

MongoDB Logo MongoDB