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 5f4944d20ec109d2d3a1f73b3718214869056299..720c3cdce78d5eb5fa1ac3c5aaa6037837f034c4 100644 (file)
--- a/lib/mr_private.h
+++ b/lib/mr_private.h
@@ -5,44 +5,16 @@
  *
  *     Copyright (C) 1987 by the Massachusetts Institute of Technology
  *
- *     Private declarations of the SMS library.
- * 
- *     $Log$
- *     Revision 1.2  1987-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 <stdio.h>
-#include <gdb.h>
-#include <sms.h>
-
-typedef struct sms_params {
-       int sms_size;
-       int sms_version_no;
-       union {
-               int procno;     /* for call */
-               int status;     /* for reply */
-       } u;
-#define sms_procno u.procno
-#define sms_status u.status
-       int sms_argc;
-       char **sms_argv;
-       int *sms_argl;
-       char *sms_flattened;
-       int sms_state;
-} sms_params;
-
-extern CONNECTION _sms_conn;
-
-extern OPERATION _sms_send_op, _sms_recv_op;
-extern int sms_start_recv(), sms_start_send();
-extern int sms_inited;
-
-#define SMS_GDB_SERV "sms:#8973"
+#include "mr_proto.h"
+
+extern CONNECTION _mr_conn;
+extern OPERATION _mr_send_op, _mr_recv_op;
+
+extern int mr_inited;
+extern int sending_version_no;
 
 /*
  * You are in a maze of twisty little FSM's, all different.
@@ -54,3 +26,17 @@ extern int sms_inited;
 
 #define EVER (;;)
        
+#define CHECK_CONNECTED {if (!_mr_conn) return MR_NOT_CONNECTED;}
+
+/*
+ * There should be an include file for these..
+ */
+       
+extern char *malloc();
+#ifndef htonl
+extern u_long htonl(), ntohl();
+extern u_short htons(), ntohs();
+#endif /* htonl */
+
+
+