diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-06-23 04:10:53 +0200 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2016-06-23 05:10:53 +0300 |
| commit | 4b7abb5b1186422637089f2863cb8c3705c026e0 (patch) | |
| tree | bbe3c26e08a748b40267158b0b451fb774bcc3a6 | |
| parent | b09c0bbad831a11e2200a6ebb48908a10ce29305 (diff) | |
build-sys: move fdset.[ch] src/basic → src/shared (#3580)
It makes use of the sd_listen_fds() call, and as such should live in
src/shared, as the distinction between src/basic and src/shared is that the
latter may use libsystemd APIs, the former does not.
Note that btrfs-util.[ch] and log.[ch] also include header files from
libsystemd, but they only need definitions, they do not invoke any function
from it. Hence they may stay in src/basic.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | src/shared/fdset.c (renamed from src/basic/fdset.c) | 0 | ||||
| -rw-r--r-- | src/shared/fdset.h (renamed from src/basic/fdset.h) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3c13acf28d..02329284f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -836,8 +836,6 @@ libbasic_la_SOURCES = \ src/basic/ordered-set.c \ src/basic/bitmap.c \ src/basic/bitmap.h \ - src/basic/fdset.c \ - src/basic/fdset.h \ src/basic/prioq.c \ src/basic/prioq.h \ src/basic/web-util.c \ @@ -1050,7 +1048,9 @@ libshared_la_SOURCES = \ src/shared/vlan-util.h \ src/shared/vlan-util.c \ src/shared/tests.h \ - src/shared/tests.c + src/shared/tests.c \ + src/shared/fdset.c \ + src/shared/fdset.h if HAVE_UTMP libshared_la_SOURCES += \ diff --git a/src/basic/fdset.c b/src/shared/fdset.c index 527f27bc67..527f27bc67 100644 --- a/src/basic/fdset.c +++ b/src/shared/fdset.c diff --git a/src/basic/fdset.h b/src/shared/fdset.h index 16efe5bdf2..16efe5bdf2 100644 --- a/src/basic/fdset.h +++ b/src/shared/fdset.h |