More clean-ups

[invirt/third/libt4.git] / lock_protocol.h

diff --git a/lock_protocol.h b/lock_protocol.h
index 60df0ef..61f0998 100644 (file)
--- a/lock_protocol.h
+++ b/lock_protocol.h
@@ -3,13 +3,14 @@
 #ifndef lock_protocol_h
 #define lock_protocol_h
 
-#include "rpc.h"
+#include "rpc/rpc.h"
+#include <string>
 
 class lock_protocol {
     public:
         enum xxstatus { OK, RETRY, RPCERR, NOENT, IOERR };
         typedef int status;
-        typedef unsigned long long lockid_t;
+        typedef std::string lockid_t;
         typedef unsigned long long xid_t;
         enum rpc_numbers {
             acquire = 0x7001,