From 72a5993debcdf1702925f39795a169675d63d35e Mon Sep 17 00:00:00 2001
From: Andy Green <andy@warmcat.com>
Date: Wed, 15 Jan 2020 12:07:20 +0000
Subject: [PATCH] clean: explicitly include libwebsockets.h in internal c now
 we use stddint types earlier

Some toolchains don't bring it in soon enough by reference from
other headers
---
 lib/core/private-lib-core.h | 30 +++++++++++++++---------------
 lib/misc/base64-decode.c    |  2 ++
 lib/misc/daemonize.c        |  1 +
 lib/misc/diskcache.c        |  1 +
 lib/misc/getifaddrs.c       |  2 ++
 lib/misc/lws-ring.c         |  1 +
 lib/misc/peer-limits.c      |  1 +
 lib/misc/romfs.c            |  1 +
 lib/misc/sha-1.c            |  1 +
 9 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/lib/core/private-lib-core.h b/lib/core/private-lib-core.h
index d8b5eca4d..702d15d2b 100644
--- a/lib/core/private-lib-core.h
+++ b/lib/core/private-lib-core.h
@@ -106,21 +106,6 @@
  #define strerror(x) ""
 #endif
 
-/*
- * Generic bidi tx credit management
- */
-
-struct lws_tx_credit {
-	int32_t			tx_cr;		/* our credit to write peer */
-	int32_t			peer_tx_cr_est; /* peer's credit to write us */
-
-	int32_t			manual_initial_tx_credit;
-
-	uint8_t			skint; /* unable to write anything */
-	uint8_t			manual;
-};
-
-
  /*
   *
   *  ------ private platform defines ------
@@ -149,6 +134,21 @@ struct lws_tx_credit {
 
 #include "libwebsockets.h"
 
+/*
+ * Generic bidi tx credit management
+ */
+
+struct lws_tx_credit {
+	int32_t			tx_cr;		/* our credit to write peer */
+	int32_t			peer_tx_cr_est; /* peer's credit to write us */
+
+	int32_t			manual_initial_tx_credit;
+
+	uint8_t			skint; /* unable to write anything */
+	uint8_t			manual;
+};
+
+
 #include "private-lib-tls.h"
 
 #if defined(WIN32) || defined(_WIN32)
diff --git a/lib/misc/base64-decode.c b/lib/misc/base64-decode.c
index 8e0cf5d0c..885ddaccc 100644
--- a/lib/misc/base64-decode.c
+++ b/lib/misc/base64-decode.c
@@ -36,6 +36,8 @@
  * of libwebsockets
  */
 
+#include <libwebsockets.h>
+
 #include <stdio.h>
 #include <string.h>
 #include "private-lib-core.h"
diff --git a/lib/misc/daemonize.c b/lib/misc/daemonize.c
index 9a1f6135a..ef066f160 100644
--- a/lib/misc/daemonize.c
+++ b/lib/misc/daemonize.c
@@ -26,6 +26,7 @@
 #include <unistd.h>
 #include <errno.h>
 
+#include <libwebsockets.h>
 #include "private-lib-core.h"
 
 pid_t pid_daemon;
diff --git a/lib/misc/diskcache.c b/lib/misc/diskcache.c
index a90070ac5..a73d0a24d 100644
--- a/lib/misc/diskcache.c
+++ b/lib/misc/diskcache.c
@@ -27,6 +27,7 @@
 #endif
 #include <pthread.h>
 
+#include <libwebsockets.h>
 #include "private-lib-core.h"
 
 #include <string.h>
diff --git a/lib/misc/getifaddrs.c b/lib/misc/getifaddrs.c
index 7daeec844..15e3eaf25 100644
--- a/lib/misc/getifaddrs.c
+++ b/lib/misc/getifaddrs.c
@@ -43,6 +43,8 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+
+#include <libwebsockets.h>
 #include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_SOCKIO_H
diff --git a/lib/misc/lws-ring.c b/lib/misc/lws-ring.c
index 0fb53a077..7eeb533ae 100644
--- a/lib/misc/lws-ring.c
+++ b/lib/misc/lws-ring.c
@@ -22,6 +22,7 @@
  * IN THE SOFTWARE.
  */
 
+#include <libwebsockets.h>
 #include "private-lib-core.h"
 
 struct lws_ring *
diff --git a/lib/misc/peer-limits.c b/lib/misc/peer-limits.c
index c84b872f0..796e6c9ed 100644
--- a/lib/misc/peer-limits.c
+++ b/lib/misc/peer-limits.c
@@ -22,6 +22,7 @@
  * IN THE SOFTWARE.
  */
 
+#include <libwebsockets.h>
 #include "private-lib-core.h"
 
 /* requires context->lock */
diff --git a/lib/misc/romfs.c b/lib/misc/romfs.c
index 814999a6e..1d2c22cb8 100644
--- a/lib/misc/romfs.c
+++ b/lib/misc/romfs.c
@@ -31,6 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <libwebsockets.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/lib/misc/sha-1.c b/lib/misc/sha-1.c
index 109bfdb8d..86d61f3d2 100644
--- a/lib/misc/sha-1.c
+++ b/lib/misc/sha-1.c
@@ -32,6 +32,7 @@
  * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
  */
 
+#include <libwebsockets.h>
 #include "private-lib-core.h"
 
 #ifdef LWS_HAVE_SYS_TYPES_H