diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/daemontools-extras/s6-notifywhenup.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile index 46f8376..cdd3415 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,9 @@ it: all CC = $(error Please use ./configure first) +STATIC_LIBS := +SHARED_LIBS := + -include config.mak include package/targets.mak include package/deps.mak diff --git a/configure b/configure index d2ff997..056061c 100755 --- a/configure +++ b/configure @@ -361,8 +361,6 @@ if $allstatic ; then vpathd= fi echo "vpath lib%.so$vpathd" -echo "STATIC_LIBS :=" -echo "SHARED_LIBS :=" if $static ; then echo "DO_STATIC := 1" else diff --git a/src/daemontools-extras/s6-notifywhenup.c b/src/daemontools-extras/s6-notifywhenup.c index 61388df..37f6de1 100644 --- a/src/daemontools-extras/s6-notifywhenup.c +++ b/src/daemontools-extras/s6-notifywhenup.c @@ -75,10 +75,10 @@ int main (int argc, char const *const *argv, char const *const *envp) else if (!pid) { PROG = "s6-notifywhenup (child)" ; - fd_close(p[1]) ; + close(p[1]) ; return run_child(p[0], fifodir, timeout) ; } - fd_close(p[0]) ; + close(p[0]) ; if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "fd_move") ; } pathexec_run(argv[0], argv, envp) ; |