mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 03:55:08 -06:00
d1a9fb85a4
Avoid separate declarations and definitions for so-called 'global' objects.
* nix/libstore/derivations.{cc, hh} (drvHashes): Use inline instead of separate
declaration and definition.
* nix/libstore/globals.{cc, hh} (settings, nixVersion): Same.
* nix/libstore/local-store.hh (drvsLogDir, deduplicationMinSize): Same.
* nix/libstore/optimise-store.cc (deduplicationMinSize): Same.
* nix/libstore/store-api.{cc, hh} (store): Same.
* nix/libutil/archive.{cc, hh} (defaultPathFilter): Same.
* nix/libutil/hash.{cc, hh} (base32Chars): Same and modify header files.
* nix/libutil/util.{cc, hh} (logType, verbosity, _writeToStderr,
_isInterrupted): Same.
* nix/local.mk: Modified according to the rename of shared.hh.
* nix/nix-daemon/guix-daemon.cc (blockInt, argvSaved, run): Same and
modify header files.
* nix/nix-daemon/nix-daemon.cc: Modify header files.
* nix/nix-daemon/shared.hh: Renamed to nix-daemon.hh
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
33 lines
1.1 KiB
C++
33 lines
1.1 KiB
C++
/* GNU Guix --- Functional package management for GNU
|
|
Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
|
|
|
|
This file is part of GNU Guix.
|
|
|
|
GNU Guix is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or (at
|
|
your option) any later version.
|
|
|
|
GNU Guix is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* Replacement for Nix's libmain/shared.hh. */
|
|
|
|
#pragma once
|
|
|
|
#include <vector>
|
|
|
|
#include <stdlib.h>
|
|
#include <signal.h>
|
|
|
|
/* Variables used by `nix-daemon.cc'. */
|
|
inline volatile ::sig_atomic_t blockInt;
|
|
inline char **argvSaved;
|
|
|
|
/* Entry point in `nix-daemon.cc'. */
|
|
void run (const std::vector<int> &);
|