mirror of
https://github.com/NixOS/nix
synced 2025-06-25 10:41:16 +02:00
Cleanup config header for libcmd
- Since it's now private, give it a rename. Note that I want to switch the
word order on the public ones too.
- Since it is only needed by two files, just include there rather than
the nasty blanket-forced thing.
(cherry picked from commit 326548bae5
)
This commit is contained in:
parent
d6359ebac5
commit
c0b219cf46
3 changed files with 5 additions and 2 deletions
|
@ -4,6 +4,8 @@
|
||||||
#include "finally.hh"
|
#include "finally.hh"
|
||||||
#include "terminal.hh"
|
#include "terminal.hh"
|
||||||
|
|
||||||
|
#include "cmd-config-private.hh"
|
||||||
|
|
||||||
#if HAVE_LOWDOWN
|
#if HAVE_LOWDOWN
|
||||||
# include <sys/queue.h>
|
# include <sys/queue.h>
|
||||||
# include <lowdown.h>
|
# include <lowdown.h>
|
||||||
|
|
|
@ -55,7 +55,7 @@ endif
|
||||||
|
|
||||||
config_h = configure_file(
|
config_h = configure_file(
|
||||||
configuration : configdata,
|
configuration : configdata,
|
||||||
output : 'config-cmd.hh',
|
output : 'cmd-config-private.hh',
|
||||||
)
|
)
|
||||||
|
|
||||||
add_project_arguments(
|
add_project_arguments(
|
||||||
|
@ -64,7 +64,6 @@ add_project_arguments(
|
||||||
'-include', 'config-util.hh',
|
'-include', 'config-util.hh',
|
||||||
'-include', 'config-store.hh',
|
'-include', 'config-store.hh',
|
||||||
'-include', 'config-expr.hh',
|
'-include', 'config-expr.hh',
|
||||||
'-include', 'config-cmd.hh',
|
|
||||||
language : 'cpp',
|
language : 'cpp',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#include "cmd-config-private.hh"
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
|
||||||
#ifdef USE_READLINE
|
#ifdef USE_READLINE
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue