From: François Revol <revol@free.fr>
Date: Mon, 26 Jul 2010 09:41:04 +0000 (+0200)
Subject: portability: use standard constants
X-Git-Tag: v2.19-rc1~399
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bf4407a1d40e5a87f9cfbb44116ce52adce9ef8;p=thirdparty%2Futil-linux.git

portability: use standard constants

Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 75c007c731..1f1c563b12 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
       memset(&sa, 0, sizeof sa);
 
       sa.sa_handler = timeout_handler;
-      sa.sa_flags   = SA_ONESHOT;
+      sa.sa_flags   = SA_RESETHAND;
       sigaction(SIGALRM, &sa, &old_sa);
 
       setitimer(ITIMER_REAL, &timeout, &old_timer);
diff --git a/text-utils/more.c b/text-utils/more.c
index 2eedfbe1a2..20efc28d67 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -62,6 +62,10 @@
 #include <regex.h>
 #undef _REGEX_RE_COMP
 
+#ifndef XTABS
+#define XTABS TAB3
+#endif
+
 #define VI		"vi"	/* found on the user's path */
 
 #define Fopen(s,m)	(Currline = 0,file_pos=0,fopen(s,m))