*** empty log message ***

diff --git a/src/lockfile.c b/src/lockfile.c
index 451901ce93ade9c596e7dc581fb3b2ed7da253b2..b3252746a902fcb82aa01be5e9d5bbaaa26bac6a 100644 (file)
--- a/src/lockfile.c
+++ b/src/lockfile.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.8  2008/02/15 20:52:36  james
+ * *** empty log message ***
+ *
  * Revision 1.7  2008/02/15 19:51:30  james
  * *** empty log message ***
  *
@@ -475,7 +478,7 @@ serial_lock_check (Serial_lock * l)
   return 1;
 }
 
-Serial_lock void
+void
 serial_lock_free (Serial_lock * l)
 {
   if (!l)

diff --git a/src/lockfile.h b/src/lockfile.h
index 71cff4a157a2d00701493b50649f35c0b05e5df4..ddfdd25a4d494e4f39db1c3c667f5658d8a0735c 100644 (file)
--- a/src/lockfile.h
+++ b/src/lockfile.h
@@ -12,6 +12,9 @@
 
 /*
  * $Log$
+ * Revision 1.5  2008/02/15 20:52:36  james
+ * *** empty log message ***
+ *
  * Revision 1.4  2008/02/15 19:51:30  james
  * *** empty log message ***
  *
@@ -29,6 +32,9 @@
 #ifndef __LOCKFILE_H__
 #define __LOCKFILE_H__
 
+#define SERIAL_LOCK_PASSIVE 0
+#define SERIAL_LOCK_ACTIVE  1
+
 #define FILE_LIST_MAX_LEN 1024
 
 typedef struct Filelist_ent {

diff --git a/src/prototypes.h b/src/prototypes.h
index f818c8893e8fdf38f154da4bc679f93ecdf19ccc..69ef02de85639fd86fde567517e0f007bd5a18b8 100644 (file)
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -163,6 +163,6 @@ extern void lockfile_remove_stale(Filelist *fl);
 extern Filelist *lockfile_lock(Filelist *fl);
 extern void lockfile_unlock(Filelist *fl);
 extern int serial_lock_check(Serial_lock *l);
-extern Serial_lock void serial_lock_free(Serial_lock *l);
+extern void serial_lock_free(Serial_lock *l);
 extern Serial_lock *serial_lock_new(char *dev, int mode);
 extern int main(int argc, char *argv[]);

diff --git a/src/serial.h b/src/serial.h
deleted file mode 100644 (file)
index dd33ad7..0000000
--- a/src/serial.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * serial.h:
- *
- * Copyright (c) 2008 James McKenzie <james@fishsoup.dhs.org>,
- * All rights reserved.
- *
- */
-
-/*
- * $Id$
- */
-
-/*
- * $Log$
- * Revision 1.1  2008/02/15 19:09:00  james
- * *** empty log message ***
- *
- */
-
-#ifndef __SERIAL_H__
-#define __SERIAL_H__
-
-#define SERIAL_LOCK_PASSIVE 0
-#define SERIAL_LOCK_ACTIVE  1
-
-#endif /* __SERIAL_H__ */