Switch from using RETSIGTYPE via autoconf to void.

[mmh] / sbr / lock_file.c

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index 983d9d7..11531df 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -104,7 +104,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 RETSIGTYPE alrmser(int);
+static void alrmser(int);
 
 #if !defined(HAVE_LIBLOCKFILE)
 static int lockit(struct lockinfo *);
@@ -435,18 +435,8 @@ lockit(struct lockinfo *li)
        curlock = li->curlock;
        tmplock = li->tmplock;
 
-#ifdef HAVE_MKSTEMP
        if ((fd = mkstemp(tmplock)) == -1)
                return -1;
-#else
-       if (mktemp(tmplock) == NULL)
-               return -1;
-       if (unlink(tmplock) == -1 && errno != ENOENT)
-               return -1;
-       /* create the temporary lock file */
-       if ((fd = creat(tmplock, 0600)) == -1)
-               return -1;
-#endif
 
 #if 0
        /* write our process id into lock file */
@@ -583,7 +573,7 @@ timerOFF(int fd)
 ** lockfiles, so another command doesn't remove them.
 */
 
-static RETSIGTYPE
+static void
 alrmser(int sig)
 {
        char *lockfile;