torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix more type redefinition errors.

Browse Source 
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
This commit is contained in:
Taylor R Campbell
2019-01-10 17:12:32 +00:00
committed by George Kadianakis
parent ca54424602
commit 948856c03e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/or/circuit_st.h
+4 -4
View File
@@ -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