projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update README.developers with the correct version of autoconf we need.
[mmh]
/
sbr
/
lock_file.c
diff --git
a/sbr/lock_file.c
b/sbr/lock_file.c
index
83cf01a
..
c7dffcf
100644
(file)
--- a/
sbr/lock_file.c
+++ b/
sbr/lock_file.c
@@
-19,16
+19,10
@@
#include <h/signals.h>
#include <h/utils.h>
#include <h/signals.h>
#include <h/utils.h>
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
#endif
+#include <time.h>
#include <errno.h>
#ifdef HAVE_FCNTL_H
#include <errno.h>
#ifdef HAVE_FCNTL_H
@@
-103,7
+97,7
@@
static int lkopen_dot (char *, int, mode_t);
static void lockname (char *, struct lockinfo *, int);
static void timerON (char *, int);
static void timerOFF (int);
static void lockname (char *, struct lockinfo *, int);
static void timerON (char *, int);
static void timerOFF (int);
-static RETSIGTYPE alrmser (int);
+static void alrmser (int);
#if !defined(HAVE_LIBLOCKFILE)
static int lockit (struct lockinfo *);
#if !defined(HAVE_LIBLOCKFILE)
static int lockit (struct lockinfo *);
@@
-585,16
+579,12
@@
timerOFF (int fd)
* lockfiles, so another command doesn't remove them.
*/
* lockfiles, so another command doesn't remove them.
*/
-static RETSIGTYPE
+static void
alrmser (int sig)
{
char *lockfile;
struct lock *lp;
alrmser (int sig)
{
char *lockfile;
struct lock *lp;
-#ifndef RELIABLE_SIGNALS
- SIGNAL (SIGALRM, alrmser);
-#endif
-
/* update the ctime of all the lock files */
for (lp = l_top; lp; lp = lp->l_next) {
lockfile = lp->l_lock;
/* update the ctime of all the lock files */
for (lp = l_top; lp; lp = lp->l_next) {
lockfile = lp->l_lock;