Stop pulling pqueue.h into ssl_locl.h since only a small part of libssl

actually needs it. Instead, just include it in the files where it is
actually necessary.

Also remove standard includes from pqueue.h so that they are not available
as a side effect. Just add the two includes that are needed to pqueue.c.

ok miod@

diff --git a/lib/libssl/d1_both.c b/lib/libssl/d1_both.c
index 10b62cd..0e32825 100644 (file)
--- a/lib/libssl/d1_both.c
+++ b/lib/libssl/d1_both.c
@@ -123,6 +123,8 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
+#include "pqueue.h"
+
 #define RSMBLY_BITMASK_SIZE(msg_len) (((msg_len) + 7) / 8)
 
 #define RSMBLY_BITMASK_MARK(bitmask, start, end) { \

diff --git a/lib/libssl/d1_lib.c b/lib/libssl/d1_lib.c
index b6b7656..a2500ee 100644 (file)
--- a/lib/libssl/d1_lib.c
+++ b/lib/libssl/d1_lib.c
@@ -64,6 +64,8 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
+
+#include "pqueue.h"
 #include "ssl_locl.h"
 
 const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;

diff --git a/lib/libssl/d1_pkt.c b/lib/libssl/d1_pkt.c
index df18e5b..a9ccc6d 100644 (file)
--- a/lib/libssl/d1_pkt.c
+++ b/lib/libssl/d1_pkt.c
@@ -121,6 +121,8 @@
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 
+#include "pqueue.h"
+
 /* mod 128 saturating subtract of two 64-bit values in big-endian order */
 static int
 satsub64be(const unsigned char *v1, const unsigned char *v2)

diff --git a/lib/libssl/pqueue.c b/lib/libssl/pqueue.c
index daf5e21..af85300 100644 (file)
--- a/lib/libssl/pqueue.c
+++ b/lib/libssl/pqueue.c
@@ -57,7 +57,9 @@
  *
  */
 
+#include <stdlib.h>
 #include <string.h>
+
 #include "pqueue.h"
 
 typedef struct _pqueue {

diff --git a/lib/libssl/pqueue.h b/lib/libssl/pqueue.h
index 6e7df8f..4b16787 100644 (file)
--- a/lib/libssl/pqueue.h
+++ b/lib/libssl/pqueue.h
@@ -60,10 +60,6 @@
 #ifndef HEADER_PQUEUE_H
 #define HEADER_PQUEUE_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct _pqueue *pqueue;
 
 typedef struct _pitem {

diff --git a/lib/libssl/src/ssl/d1_both.c b/lib/libssl/src/ssl/d1_both.c
index 10b62cd..0e32825 100644 (file)
--- a/lib/libssl/src/ssl/d1_both.c
+++ b/lib/libssl/src/ssl/d1_both.c
@@ -123,6 +123,8 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
+#include "pqueue.h"
+
 #define RSMBLY_BITMASK_SIZE(msg_len) (((msg_len) + 7) / 8)
 
 #define RSMBLY_BITMASK_MARK(bitmask, start, end) { \

diff --git a/lib/libssl/src/ssl/d1_lib.c b/lib/libssl/src/ssl/d1_lib.c
index b6b7656..a2500ee 100644 (file)
--- a/lib/libssl/src/ssl/d1_lib.c
+++ b/lib/libssl/src/ssl/d1_lib.c
@@ -64,6 +64,8 @@
 
 #include <stdio.h>
 #include <openssl/objects.h>
+
+#include "pqueue.h"
 #include "ssl_locl.h"
 
 const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;

diff --git a/lib/libssl/src/ssl/d1_pkt.c b/lib/libssl/src/ssl/d1_pkt.c
index df18e5b..a9ccc6d 100644 (file)
--- a/lib/libssl/src/ssl/d1_pkt.c
+++ b/lib/libssl/src/ssl/d1_pkt.c
@@ -121,6 +121,8 @@
 #include <openssl/buffer.h>
 #include <openssl/rand.h>
 
+#include "pqueue.h"
+
 /* mod 128 saturating subtract of two 64-bit values in big-endian order */
 static int
 satsub64be(const unsigned char *v1, const unsigned char *v2)

diff --git a/lib/libssl/src/ssl/pqueue.c b/lib/libssl/src/ssl/pqueue.c
index daf5e21..af85300 100644 (file)
--- a/lib/libssl/src/ssl/pqueue.c
+++ b/lib/libssl/src/ssl/pqueue.c
@@ -57,7 +57,9 @@
  *
  */
 
+#include <stdlib.h>
 #include <string.h>
+
 #include "pqueue.h"
 
 typedef struct _pqueue {

diff --git a/lib/libssl/src/ssl/pqueue.h b/lib/libssl/src/ssl/pqueue.h
index 6e7df8f..4b16787 100644 (file)
--- a/lib/libssl/src/ssl/pqueue.h
+++ b/lib/libssl/src/ssl/pqueue.h
@@ -60,10 +60,6 @@
 #ifndef HEADER_PQUEUE_H
 #define HEADER_PQUEUE_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct _pqueue *pqueue;
 
 typedef struct _pitem {

diff --git a/lib/libssl/src/ssl/ssl_locl.h b/lib/libssl/src/ssl/ssl_locl.h
index a0c3017..012a38c 100644 (file)
--- a/lib/libssl/src/ssl/ssl_locl.h
+++ b/lib/libssl/src/ssl/ssl_locl.h
@@ -164,8 +164,6 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-#include "pqueue.h"
-
 #define c2l(c,l)       (l = ((unsigned long)(*((c)++)))     , \
                         l|=(((unsigned long)(*((c)++)))<< 8), \
                         l|=(((unsigned long)(*((c)++)))<<16), \

diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h
index a0c3017..012a38c 100644 (file)
--- a/lib/libssl/ssl_locl.h
+++ b/lib/libssl/ssl_locl.h
@@ -164,8 +164,6 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-#include "pqueue.h"
-
 #define c2l(c,l)       (l = ((unsigned long)(*((c)++)))     , \
                         l|=(((unsigned long)(*((c)++)))<< 8), \
                         l|=(((unsigned long)(*((c)++)))<<16), \