simon-git: halibut (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  081a686 Fix macro redefinition warning in version.h.
  d9b77f1 Fix build failure with gcc -fno-common.

Repository:     https://git.tartarus.org/simon/halibut.git
On the web:     https://git.tartarus.org/?p=simon/halibut.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2020-02-10 20:25:26

commit 081a68646594df321a53907ba1524128cbbae313
web diff https://git.tartarus.org/?p=simon/halibut.git;a=commitdiff;h=081a68646594df321a53907ba1524128cbbae313;hp=44df6568af58db34b33f7f13a528f0765cfc425e
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Feb 10 20:23:04 2020 +0000

    Fix macro redefinition warning in version.h.
    
    If anything on the command line has #defined VERSION (as the autotools
    makefile does, for example), then we definitely shouldn't redefine it
    to 'unidentified version'.

 version.h | 2 ++
 1 file changed, 2 insertions(+)

commit d9b77f148a76e65a270ad6087e0515605c813e36
web diff https://git.tartarus.org/?p=simon/halibut.git;a=commitdiff;h=d9b77f148a76e65a270ad6087e0515605c813e36;hp=081a68646594df321a53907ba1524128cbbae313
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Feb 10 20:23:46 2020 +0000

    Fix build failure with gcc -fno-common.
    
    Now 'all_fonts' is only _declared_ in paper.h, and it's _defined_ in
    exactly one source file.
    
    I'm told that in gcc 10, -fno-common has become the default, so this
    avoids needing a manual addition of a build flag at configure time.

 bk_paper.c | 2 ++
 paper.h    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)