common: move instance id code from rpc to common

Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
7 files changed, 8 insertions(+), 7 deletions(-)

M common/CMakeLists.txt
M rpc/include/hlog-rpc/instance.h => common/include/hlog/instance.h
M rpc/instance.c => common/instance.c
M hlog/contest.c
M rpc/CMakeLists.txt
M rpc/announce-sock.c
M rpc/announce-track.c
M common/CMakeLists.txt +1 -0
@@ 37,6 37,7 @@ add_library(hlogcommon SHARED
 	country.c
 	csv.c
 	index.c
+	instance.c
 	iso3166.c
 	lcd.c
 	maidenhead.c

          
M rpc/include/hlog-rpc/instance.h => common/include/hlog/instance.h +2 -2
@@ 20,8 20,8 @@ 
  * SOFTWARE.
  */
 
-#ifndef __RPC_INSTANCE_H
-#define __RPC_INSTANCE_H
+#ifndef __INSTANCE_H
+#define __INSTANCE_H
 
 extern int instance_init(int dirfd);
 extern uint32_t instance_get(void);

          
M rpc/instance.c => common/instance.c +1 -1
@@ 25,7 25,7 @@ 
 #include <jeffpc/io.h>
 #include <jeffpc/val.h>
 
-#include <hlog-rpc/instance.h>
+#include <hlog/instance.h>
 
 /*
  * This file implements the 'instance id'.  Ideally, an instance id would

          
M hlog/contest.c +1 -1
@@ 36,11 36,11 @@ 
 #include <hlog/version.h>
 #include <hlog/qso.h>
 #include <hlog/index.h>
+#include <hlog/instance.h>
 #include <hlog/util.h>
 #include <hlog-lua/xlua.h>
 
 #include <hlog-rpc/announce-pub.h>
-#include <hlog-rpc/instance.h>
 #include <hlog-rpc/hamlib.h>
 #include <hlog-rpc/rpc-server.h>
 

          
M rpc/CMakeLists.txt +0 -1
@@ 29,7 29,6 @@ add_library(hlogrpc SHARED
 	announce-track.c
 	hamlib.c
 	hamlib-quirks.c
-	instance.c
 	rpc-client.c
 	rpc-server.c
 )

          
M rpc/announce-sock.c +1 -1
@@ 25,11 25,11 @@ 
 #include <jeffpc/cstr.h>
 #include <jeffpc/time.h>
 
+#include <hlog/instance.h>
 #include <hlog/udpsvc.h>
 
 #include <hlog-rpc/announce.h>
 #include <hlog-rpc/announce-pub.h>
-#include <hlog-rpc/instance.h>
 
 #include "announce-impl.h"
 

          
M rpc/announce-track.c +2 -1
@@ 31,9 31,10 @@ 
 #include <jeffpc/cbor.h>
 #include <jeffpc/nvl.h>
 
+#include <hlog/instance.h>
+
 #include <hlog-rpc/announce.h>
 #include <hlog-rpc/announce-sub.h>
-#include <hlog-rpc/instance.h>
 
 #include "announce-impl.h"