[tor-commits] [tor/master] Fix more type redefinition errors.

[nickm at torproject.org]

commit 948856c03ef417cc9dad9ef85b7bb5c164edb742
Author: Taylor R Campbell <campbell+tor at mumble.net>
Date:   Thu Jan 10 17:12:32 2019 +0000

    Fix more type redefinition errors.
    
    In file included from ./src/core/or/or_circuit_st.h:12:0,
                     from src/core/or/circuitlist.c:112:
    ./src/core/or/circuit_st.h:15:39: error: redefinition of typedef ‘circpad_machine_spec_t’
    ./src/core/or/circuitpadding.h:572:3: note: previous declaration of ‘circpad_machine_spec_t’ was here
    ./src/core/or/circuit_st.h:16:40: error: redefinition of typedef ‘circpad_machine_state_t’
    ./src/core/or/circuitpadding.h:517:3: note: previous declaration of ‘circpad_machine_state_t’ was here
---
 src/core/or/circuit_st.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/or/circuit_st.h b/src/core/or/circuit_st.h
index bfbd336c3..47639940d 100644
--- a/src/core/or/circuit_st.h
+++ b/src/core/or/circuit_st.h
@@ -12,8 +12,8 @@
 #include "core/or/cell_queue_st.h"
 
 struct hs_token_t;
-typedef struct circpad_machine_spec_t circpad_machine_spec_t;
-typedef struct circpad_machine_state_t circpad_machine_state_t;
+struct circpad_machine_spec_t;
+struct circpad_machine_state_t;
 
 /** Number of padding state machines on a circuit. */
 #define CIRCPAD_MAX_MACHINES (2)
@@ -189,7 +189,7 @@ struct circuit_t {
    *
    *  Each element of this array corresponds to a different padding machine,
    *  and we can have up to CIRCPAD_MAX_MACHINES such machines. */
-  const circpad_machine_spec_t *padding_machine[CIRCPAD_MAX_MACHINES];
+  const struct circpad_machine_spec_t *padding_machine[CIRCPAD_MAX_MACHINES];
 
   /** Adaptive Padding machine info for above machines. This is the
    *  per-circuit mutable information, such as the current state and
@@ -200,7 +200,7 @@ struct circuit_t {
    *
    *  Each element of this array corresponds to a different padding machine,
    *  and we can have up to CIRCPAD_MAX_MACHINES such machines. */
-  circpad_machine_state_t *padding_info[CIRCPAD_MAX_MACHINES];
+  struct circpad_machine_state_t *padding_info[CIRCPAD_MAX_MACHINES];
 };
 
 #endif