Move fp_pair_t declaration to fp_pair.h.

diff --git a/src/or/directory.c b/src/or/directory.c
index 720ef975baf41ce7119888cf05cfbb97e7bbaf11..00605c054a0c207e4ad6dfdd2aa7e977c7a11ce0 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -23,6 +23,7 @@
 #include "directory.h"
 #include "dirserv.h"
 #include "entrynodes.h"
+#include "fp_pair.h"
 #include "geoip.h"
 #include "hs_cache.h"
 #include "hs_common.h"

diff --git a/src/or/fp_pair.h b/src/or/fp_pair.h
index 4498a16101f4666fa619130bbe868ec5001ff4c9..3c5c33bcbe6702ad2b48a63320b091dfefcb4a29 100644 (file)
--- a/src/or/fp_pair.h
+++ b/src/or/fp_pair.h
@@ -9,6 +9,12 @@
 #ifndef _TOR_FP_PAIR_H
 #define _TOR_FP_PAIR_H
 
+/** A pair of digests created by dir_split_resource_info_fingerprint_pairs() */
+typedef struct {
+  char first[DIGEST_LEN];
+  char second[DIGEST_LEN];
+} fp_pair_t;
+
 /*
  * Declare fp_pair_map_t functions and structs
  */

diff --git a/src/or/or.h b/src/or/or.h
index dd46bfd052d281b93ccb4eda3deecbd4b3eee73c..5b7d4344c48b20458adcac6cbf7c8f2a7b59b3e3 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3877,14 +3877,6 @@ typedef enum {
   BOOTSTRAP_STATUS_DONE=100
 } bootstrap_status_t;
 
-/********************************* directory.c ***************************/
-
-/** A pair of digests created by dir_split_resource_info_fingerprint_pairs() */
-typedef struct {
-  char first[DIGEST_LEN];
-  char second[DIGEST_LEN];
-} fp_pair_t;
-
 /********************************* dirserv.c ***************************/
 
 /** An enum to describe what format we're generating a routerstatus line in.

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 5bcbc80e8c9a9106a501a1aefc2245e4b7f1682e..43fc5c5fb411baa40b1ab73d4d40872616789c34 100644 (file)
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -28,6 +28,7 @@
 #include "dirserv.h"
 #include "dirauth/dirvote.h"
 #include "entrynodes.h"
+#include "fp_pair.h"
 #include "hibernate.h"
 #include "memarea.h"
 #include "networkstatus.h"