Fix build with GLib 2.68 and later. Taken from upstream pull request: https://github.com/autotrace/autotrace/pull/41 diff --git a/src/autotrace.h b/src/autotrace.h --- a/src/autotrace.h +++ b/src/autotrace.h @@ -23,6 +23,9 @@ #include +#include "types.h" +#include "color.h" + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -35,9 +38,6 @@ extern "C" { * Typedefs * ===================================================================== */ -#include "types.h" -#include "color.h" - /* Third degree is the highest we deal with. */ enum _at_polynomial_degree { AT_LINEARTYPE = 1, diff --git a/src/color.h b/src/color.h --- a/src/color.h +++ b/src/color.h @@ -24,6 +24,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + typedef struct _at_color at_color; struct _at_color { guint8 r; @@ -43,4 +47,7 @@ void at_color_free(at_color * color); GType at_color_get_type(void); #define AT_TYPE_COLOR (at_color_get_type ()) +#ifdef __cplusplus +} +#endif /* __cplusplus */ #endif /* not AT_COLOR_H */ 35f406a86ed7b8'>refslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-24etc: completion: Filter gratuitous spaces from available packages.Liliana Marie Prikler
Tested with: guix environment --{ad-hoc,pure} zsh guix bash-completion coreutils -- zsh % fpath=(~/guix/etc/completion/zsh $fpath) % autoload -U compinit; compinit * etc/completion/zsh/_guix (_guix_list_available_packages): Remove spaces. Co-authored-by: Tobias Geerinckx-Rice <me@tobias.gr>
2021-08-28zsh completion: Add missing commands and arguments.Noah Evans
* etc/completion/zsh/_guix (_guix_install, _guix_remove, _guix_upgrade): New functions. (_guix_build, _guix_challenge, _guix_download, _guix_environment, _guix_packages, _guix_gc, _guix_hash, _guix_lint, _guix_package, _guix_publish, _guix_pull, _guix_refresh, _guix_size, _guix_system): Add some of the missing arguments. (_guix_cmds): Add missing commands. Co-authored-by: Brice Waegeneire <brice@waegenei.re>
2021-02-17scripts: system: Remove 'vm-image' command.Mathieu Othacehe
Remove the 'vm-image' command that has been superseded by the 'image' command. * gnu/system/vm.scm (system-qemu-image): Remove it. * guix/scripts/system.scm (system-derivation-for-action): Mark 'vm-image' command as deprecated and use the image API to produce the VM image. (perform-action, show-help): Adapt accordingly. * tests/guix-system.sh: Ditto. * doc/guix.texi (Invoking guix system, Running Guix in a VM): Ditto. * etc/completion/fish/guix.fish: Ditto. * etc/completion/zsh/_guix: Ditto.