Since pqueue is a private interface and the header defining the struct

isn't even exported, there's no (sane) way for someone else to use the
typedef.  Eliminate the typedef and just use "struct _pqueue *".

duplicate typedef pointed out by Brent Cook (busterb (at) gmail.com)
ok miod@

2 files changed, 6 insertions, 8 deletions

diff --git a/src/lib/libssl/dtls1.h b/src/lib/libssl/dtls1.h
index b0cf839b78..5a14ee427b 100644
--- a/src/lib/libssl/dtls1.h
+++ b/src/lib/libssl/dtls1.h
@@ -144,11 +144,10 @@ struct dtls1_timeout_st {
 };
 
 struct _pqueue;
-typedef struct _pqueue *pqueue;
 
 typedef struct record_pqueue_st {
         unsigned short epoch;
-        pqueue q;
+        struct _pqueue *q;
 } record_pqueue;
 
 typedef struct hm_fragment_st {
@@ -191,10 +190,10 @@ typedef struct dtls1_state_st {
         record_pqueue processed_rcds;
 
         /* Buffered handshake messages */
-        pqueue buffered_messages;
+        struct _pqueue *buffered_messages;
 
         /* Buffered (sent) handshake records */
-        pqueue sent_messages;
+        struct _pqueue *sent_messages;
 
         /* Buffered application records.
          * Only for records between CCS and Finished
diff --git a/src/lib/libssl/src/ssl/dtls1.h b/src/lib/libssl/src/ssl/dtls1.h
index b0cf839b78..5a14ee427b 100644
--- a/src/lib/libssl/src/ssl/dtls1.h
+++ b/src/lib/libssl/src/ssl/dtls1.h
@@ -144,11 +144,10 @@ struct dtls1_timeout_st {
 };
 
 struct _pqueue;
-typedef struct _pqueue *pqueue;
 
 typedef struct record_pqueue_st {
         unsigned short epoch;
-        pqueue q;
+        struct _pqueue *q;
 } record_pqueue;
 
 typedef struct hm_fragment_st {
@@ -191,10 +190,10 @@ typedef struct dtls1_state_st {
         record_pqueue processed_rcds;
 
         /* Buffered handshake messages */
-        pqueue buffered_messages;
+        struct _pqueue *buffered_messages;
 
         /* Buffered (sent) handshake records */
-        pqueue sent_messages;
+        struct _pqueue *sent_messages;
 
         /* Buffered application records.
          * Only for records between CCS and Finished