Diane Delgado's changes for a fixed table-locking order

[moira.git] / include / dcm.h

diff --git a/include/dcm.h b/include/dcm.h
index 5a51294af58217f6561dce1861af489b1143fe44..a97a2be4d8945c8af469cd5a5d67c0d1d03cf75f 100644 (file)
--- a/include/dcm.h
+++ b/include/dcm.h
@@ -6,8 +6,8 @@
 #define UPCALL_CONT    0
 #define UPCALL_STOP    1
 
-#define HARD_FAIL(x)   (((x) != 0 ) && ((x) != SMS_NO_CHANGE))
-#define SOFT_FAIL(x)   (((x) == SMS_NO_MEM) || ((x) == SMS_CANT_CONNECT) || ((x) == SMS_CCONFIG) || ((x) == SMS_DEADLOCK))
+#define HARD_FAIL(x)   (((x) != 0 ) && ((x) != MR_NO_CHANGE))
+#define SOFT_FAIL(x)   (((x) == MR_NO_MEM) || ((x) == MR_CANT_CONNECT) || ((x) == MR_CCONFIG) || ((x) == MR_DEADLOCK) || ((x) == MR_BUSY))
 
 
 #define DEADLOCK_WAIT  (3 * 60)        /* number of seconds to wait after
@@ -79,7 +79,7 @@ struct svrhost {
 
 
 /*--> utils.c <--*/
-extern void init_sms();
+extern void init_mr();
 extern void dcm_com_err_hook();
 extern void leave();
 extern void scream();