aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <>2008-02-15 20:52:36 +0000
committerjames <>2008-02-15 20:52:36 +0000
commit15e84568cdefdddc2191d15156ab5e35d57b47be (patch)
tree7c47628593209f2454fcd33926830e24284605a6
parentf5c0446975d0e1109a1c15f272f35fd7e20dbf9b (diff)
downloadsympathy-15e84568cdefdddc2191d15156ab5e35d57b47be.tar.gz
sympathy-15e84568cdefdddc2191d15156ab5e35d57b47be.tar.bz2
sympathy-15e84568cdefdddc2191d15156ab5e35d57b47be.zip
*** empty log message ***
-rw-r--r--src/lockfile.c5
-rw-r--r--src/lockfile.h6
-rw-r--r--src/prototypes.h2
-rw-r--r--src/serial.h26
4 files changed, 11 insertions, 28 deletions
diff --git a/src/lockfile.c b/src/lockfile.c
index 451901c..b325274 100644
--- 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 71cff4a..ddfdd25 100644
--- 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 f818c88..69ef02d 100644
--- 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
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__ */