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

[moira.git] / lib / mr_private.h

diff --git a/lib/mr_private.h b/lib/mr_private.h
index d782d91c2bc29ac688551f007f9a85716e82867b..720c3cdce78d5eb5fa1ac3c5aaa6037837f034c4 100644 (file)
--- a/lib/mr_private.h
+++ b/lib/mr_private.h
@@ -5,26 +5,16 @@
  *
  *     Copyright (C) 1987 by the Massachusetts Institute of Technology
  *
- *     Private declarations of the SMS library.
- * 
- *     $Log$
- *     Revision 1.3  1987-06-16 17:48:39  wesommer
- *     Clean up memory allocation, indenting.
- *
- * Revision 1.2  87/05/31  22:07:06  wesommer
- * Private data to the sms server and library.
- * 
- * Revision 1.1  87/05/20  03:12:00  wesommer
- * Initial revision
- * 
+ *     Private declarations of the Moira library.
  */
 
-#include "sms_proto.h"
+#include "mr_proto.h"
 
-extern CONNECTION _sms_conn;
-extern OPERATION _sms_send_op, _sms_recv_op;
+extern CONNECTION _mr_conn;
+extern OPERATION _mr_send_op, _mr_recv_op;
 
-extern int sms_inited;
+extern int mr_inited;
+extern int sending_version_no;
 
 /*
  * You are in a maze of twisty little FSM's, all different.
@@ -36,7 +26,7 @@ extern int sms_inited;
 
 #define EVER (;;)
        
-#define CHECK_CONNECTED {if (!_sms_conn) return SMS_NOT_CONNECTED;}
+#define CHECK_CONNECTED {if (!_mr_conn) return MR_NOT_CONNECTED;}
 
 /*
  * There should be an include file for these..
@@ -46,7 +36,7 @@ extern char *malloc();
 #ifndef htonl
 extern u_long htonl(), ntohl();
 extern u_short htons(), ntohs();
-#endif htonl
+#endif /* htonl */