summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbootstrap.sh2
-rw-r--r--libdaemon/dnonblock.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index 2c872e1..30ae6cf 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -55,7 +55,7 @@ else
mkdir -p common
"$LIBTOOLIZE" -c --force
- run_versioned aclocal "$VERSION" -I common
+ run_versioned aclocal "$VERSION" -I m4
run_versioned autoconf 2.59 -Wall
run_versioned autoheader 2.59
run_versioned automake "$VERSION" -a -c --foreign
diff --git a/libdaemon/dnonblock.c b/libdaemon/dnonblock.c
index c16d511..ff1f28d 100644
--- a/libdaemon/dnonblock.c
+++ b/libdaemon/dnonblock.c
@@ -33,12 +33,12 @@ int daemon_nonblock(int fd, int b) {
return -1;
if (b)
- c = a | O_NDELAY;
+ c = a | O_NONBLOCK;
else
- c = a & ~O_NDELAY;
+ c = a & ~O_NONBLOCK;
if (c == a)
return 0;
- return fcntl(fd, F_SETFL, a);
+ return fcntl(fd, F_SETFL, c);
}