summaryrefslogtreecommitdiff
path: root/src/or/channel.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-01-30 12:27:19 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-30 12:58:49 -0500
commit35daf6f6029c3285b260f9a3f4287b2fa063c3eb (patch)
treea3622dca2c337393993a33089ef666cb33b5d30e /src/or/channel.h
parent29136bd7e4a671bf58dcc7c5d8d82fd63f9c66f7 (diff)
downloadtor-35daf6f6029c3285b260f9a3f4287b2fa063c3eb.tar.gz
tor-35daf6f6029c3285b260f9a3f4287b2fa063c3eb.zip
Rename all of the macros in tor_queue.h to start with TOR_
Diffstat (limited to 'src/or/channel.h')
-rw-r--r--src/or/channel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channel.h b/src/or/channel.h
index 31bd519474..ec79888063 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -19,7 +19,7 @@ typedef void (*channel_cell_handler_fn_ptr)(channel_t *, cell_t *);
typedef void (*channel_var_cell_handler_fn_ptr)(channel_t *, var_cell_t *);
struct cell_queue_entry_s;
-SIMPLEQ_HEAD(chan_cell_queue, cell_queue_entry_s) incoming_queue;
+TOR_SIMPLEQ_HEAD(chan_cell_queue, cell_queue_entry_s) incoming_queue;
typedef struct chan_cell_queue chan_cell_queue_t;
/*
@@ -125,7 +125,7 @@ struct channel_s {
* Linked list of channels with the same identity digest, for the
* digest->channel map
*/
- LIST_ENTRY(channel_s) next_with_same_id;
+ TOR_LIST_ENTRY(channel_s) next_with_same_id;
/* List of incoming cells to handle */
chan_cell_queue_t incoming_queue;