[tor-commits] [tor/master] hs: Stub link_specifier_t in hs_descriptor.h

[nickm at torproject.org]

commit 61009d40d127e0435e9fd98a8daf81c50e6687f0
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Aug 22 14:10:30 2017 -0400

    hs: Stub link_specifier_t in hs_descriptor.h
    
    Avoid including a huge trunnel interface everytime we include hs_descriptor.h
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/hs_descriptor.c | 5 ++---
 src/or/hs_descriptor.h | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c
index 71f16fee1..b9233c6d7 100644
--- a/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@ -55,11 +55,10 @@
 /* For unit tests.*/
 #define HS_DESCRIPTOR_PRIVATE
 
-#include "hs_descriptor.h"
-
 #include "or.h"
-#include "circuitbuild.h"
 #include "ed25519_cert.h" /* Trunnel interface. */
+#include "hs_descriptor.h"
+#include "circuitbuild.h"
 #include "parsecommon.h"
 #include "rendcache.h"
 #include "hs_cache.h"
diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h
index b4cda7b84..eeeb3e38a 100644
--- a/src/or/hs_descriptor.h
+++ b/src/or/hs_descriptor.h
@@ -19,7 +19,7 @@
 #include "torcert.h"
 
 /* Trunnel */
-#include "ed25519_cert.h"
+struct link_specifier_t;
 
 /* The earliest descriptor format version we support. */
 #define HS_DESC_SUPPORTED_FORMAT_VERSION_MIN 3