Index: trunk/Ohana/src/libohana/include/ohana.h
===================================================================
--- trunk/Ohana/src/libohana/include/ohana.h	(revision 3522)
+++ trunk/Ohana/src/libohana/include/ohana.h	(revision 3649)
@@ -36,17 +36,23 @@
 # define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec))
 
-# define LCK_UNLOCK  0   /* file is unlocked */
-# define LCK_ACCESS  1   /* can't get access to file */
-# define LCK_TIMEOUT 2   /* timeout setting lock */
-# define LCK_HARDLCK 3   /* error setting hard lockfile */
-# define LCK_HUNLOCK 4   /* error clearing hard lockfile */
+enum {
+ LCK_UNLOCK,        /* file is unlocked */
+ LCK_INVALID,       /* invalid locktype requested */
+ LCK_MISSING,       /* soft requested and file missing (error) */
+ LCK_ACCESS,        /* can't get access to file */
+ LCK_TIMEOUT,       /* timeout setting lock */
+ LCK_HARDOPEN,      /* cannot open hard lockfile */
+ LCK_HARDLOCK,      /* cannot lock hard lockfile */
+ LCK_HARDLOCKHARD,  /* hard lockfile is locked */
+ LCK_HARDCLOSE,     /* cannot write to hardlock */
 
-# define LCK_EMPTY   5   /* locked file is empty */
-# define LCK_FULL    6   /* locked file is not empty */
-# define LCK_UNKNOWN 7   /* can't stat file to get size */
+ LCK_EMPTY,         /* file is locked and empty */
+ LCK_FULL,          /* file is locked and not empty */
+ LCK_UNKNOWN,       /* file is locked, but can't get size */
 
-# define LCK_SOFT    10  /* soft lock */
-# define LCK_HARD    11  /* hard lock */
-# define LCK_XCLD    12  /* exclusive soft lock */
+ LCK_SOFT,          /* soft lock */
+ LCK_HARD,          /* hard lock */
+ LCK_XCLD,          /* exclusive soft lock */
+};
 
 # ifndef M_PI
@@ -126,6 +132,4 @@
 FILE *fsetlockfile (char *filename, double timeout, int type, int *state);
 int   fclearlockfile (char *filename, FILE *f, int type, int *state);
-int   setlockfile2 (char *filename, double timeout, int type, int *state);
-int   clearlockfile2 (char *filename, int fd, int type, int *state);
 
 /* in config.c */