summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-07-04 22:46:26 +0200
committerLudovic Courtès <ludo@gnu.org>2013-07-04 22:46:26 +0200
commit5363abb776e71de10545ac96112ff6e5cd4c1559 (patch)
tree05c0f1b624120bf6606979eb7f29a46e96a7742e /nix
parenta1c39ede7defcfe901e926ac384b77ba11c64f97 (diff)
daemon: Make argp usage compatible with libc on GNU/Hurd.
* nix/nix-daemon/guix-daemon.cc (parse_opt): Cast return value to `error_t' for the sake of GNU/Hurd. Reported by Matthew Lien <bluet@bluet.org> at <http://lists.gnu.org/archive/html/bug-guix/2013-07/msg00002.html>.
Diffstat (limited to 'nix')
-rw-r--r--nix/nix-daemon/guix-daemon.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index 5f0710c256..e2c30e75a8 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -171,10 +171,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
settings.thisSystem = arg;
break;
default:
- return ARGP_ERR_UNKNOWN;
+ return (error_t) ARGP_ERR_UNKNOWN;
}
- return 0;
+ return (error_t) 0;
}
/* Argument parsing. */