diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-12 14:09:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-12 14:09:29 +0200 |
| commit | ea1673808584f3c40cc76cc2ea570676309ba5bc (patch) | |
| tree | a300726c4152931064349b46e7401ff80040e4a3 /nix/libutil/gcrypt-hash.hh | |
| parent | 8eaa8a3bf048997288633191a278028a65d78ae3 (diff) | |
| download | patches-ea1673808584f3c40cc76cc2ea570676309ba5bc.tar patches-ea1673808584f3c40cc76cc2ea570676309ba5bc.tar.gz | |
daemon: Use 'int' instead of the internal 'gcry_md_algo_t' type.
Fixes compilation with the forthcoming libgcrypt 1.6.x.
Reported by Matthias Wachs <wachs@net.in.tum.de>
and NIIBE Yutaka <gniibe@fsij.org>.
* nix/libutil/gcrypt-hash.cc (guix_hash_init, guix_hash_final): Use
'int' as the type of the 'algo' parameter.
* nix/libutil/gcrypt-hash.hh: Update declarations accordingly.
Diffstat (limited to 'nix/libutil/gcrypt-hash.hh')
| -rw-r--r-- | nix/libutil/gcrypt-hash.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nix/libutil/gcrypt-hash.hh b/nix/libutil/gcrypt-hash.hh index d2d40d5fb2..d93a6eb881 100644 --- a/nix/libutil/gcrypt-hash.hh +++ b/nix/libutil/gcrypt-hash.hh @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org> + Copyright (C) 2012, 2013 Ludovic Courtès <ludo@gnu.org> This file is part of GNU Guix. @@ -30,10 +30,10 @@ struct guix_hash_context gcry_md_hd_t md_handle; }; -extern void guix_hash_init (struct guix_hash_context *ctx, gcry_md_algo_t algo); +extern void guix_hash_init (struct guix_hash_context *ctx, int algo); extern void guix_hash_update (struct guix_hash_context *ctx, const void *buffer, size_t len); extern void guix_hash_final (void *resbuf, struct guix_hash_context *ctx, - gcry_md_algo_t algo); + int algo); } |