commit e10a628aa1d46df600ffc7194d35f67416eaefdd
from: Stefan Sperling <stsp@stsp.name>
date: Wed Sep 16 12:42:09 2020 UTC

avoid include statements in header files; make each .c pull in what's needed

commit - 3e6cba3a54789e151b37851eef9cdccc4180ae40
commit + e10a628aa1d46df600ffc7194d35f67416eaefdd
blob - cbf36375d4d7bd0e742b3785518f45c59f5444cf
blob + 7846e5688b5f703b6d8d58917d7050d3174b578a
--- diff/diff.c
+++ diff/diff.c
@@ -24,9 +24,11 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <diff/arraylist.h>
 #include <diff/diff_main.h>
 #include <diff/diff_output.h>
 
blob - 4919ba0a7b679293b70df000738153eefb9d6b91
blob + 844b0c3432c7f119512c6a8f840691ddb9c39689
--- include/diff/arraylist.h
+++ include/diff/arraylist.h
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#pragma once
-
 #ifdef __linux__
 /* stupid shims to compile and test on linux */
 #include <strings.h>
blob - 00cef1ebed7779aaad54a20ad936c4914a78ec4b
blob + 0dbd866be6ebf41975cc4e1b917e8f2d8b0be150
--- include/diff/diff_main.h
+++ include/diff/diff_main.h
@@ -14,16 +14,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <errno.h>
-
-#include <diff/arraylist.h>
 
 #ifndef MAX
 #define MAX(A,B) ((A)>(B)?(A):(B))
blob - 0b28108d3fcf55aa81c9464272b99a224fc722da
blob + 92887ff151b6faa423752b1fa9baa3c123f19726
--- include/diff/diff_output.h
+++ include/diff/diff_output.h
@@ -15,11 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#pragma once
-
-#include <stdio.h>
-#include <diff/diff_main.h>
-
 struct diff_input_info {
 	const char *left_path;
 	const char *right_path;
blob - 3af44d4f53fe470fb58794596298080da09ca302
blob + 84e300ed36abdaf7a9949b72130ac7e7272686fe
--- lib/debug.h
+++ lib/debug.h
@@ -14,8 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#pragma once
-
 #define DEBUG 0
 
 #if DEBUG
blob - 02d2c8c9384587c4564891250aaa82438fb44072
blob + 55b5f9b57a9ec3733e9f55dadb03d68735b08412
--- lib/diff_atomize_text.c
+++ lib/diff_atomize_text.c
@@ -15,9 +15,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <unistd.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
+#include <diff/arraylist.h>
 #include <diff/diff_main.h>
 #include "debug.h"
 
blob - fa1314409c7f4b958f1c231fe6531512521c9add
blob + 39136bde16a7fb4b736b65a49793d7ae7a196d8e
--- lib/diff_main.c
+++ lib/diff_main.c
@@ -17,6 +17,7 @@
 
 
 #include <sys/queue.h>
+#include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -27,6 +28,7 @@
 
 #include <assert.h>
 
+#include <diff/arraylist.h>
 #include <diff/diff_main.h>
 
 #include "debug.h"
blob - 9c3cc47bf30ab96392aaa4797b567bcf7e3d3722
blob + 5a91ceba82cb3d83ec084178d1e08b56cb150395
--- lib/diff_myers.c
+++ lib/diff_myers.c
@@ -17,6 +17,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <diff/arraylist.h>
 #include <diff/diff_main.h>
 
 #include "debug.h"
blob - 07799698e67e76ec7421983f7bee626ae2aeb3c3
blob + c5f915ddbc636ce240e5a211ed99ee7bb4fc2a3b
--- lib/diff_output.c
+++ lib/diff_output.c
@@ -15,8 +15,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
+#include <diff/arraylist.h>
+#include <diff/diff_main.h>
 #include <diff/diff_output.h>
 
 static char
blob - 55255ed4ab1e8d1471c7ba2f5f1f12a19d3a5582
blob + 38318db6a210f599103e1fc40e5d5f989ea6dc0b
--- lib/diff_output_plain.c
+++ lib/diff_output_plain.c
@@ -15,8 +15,17 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <errno.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include <diff/arraylist.h>
+#include <diff/diff_main.h>
 #include <diff/diff_output.h>
 
+
 int
 diff_output_plain(FILE *dest, const struct diff_input_info *info,
 		  const struct diff_result *result)
blob - 76e4da190f34bc2e1083a4ae61146ba0841feb83
blob + 192458c53860d0a67b9316e2f7eeec6e09372cc1
--- lib/diff_output_unidiff.c
+++ lib/diff_output_unidiff.c
@@ -15,6 +15,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <errno.h>
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <diff/arraylist.h>
+#include <diff/diff_main.h>
 #include <diff/diff_output.h>
 
 #include "debug.h"
blob - 624b58c23e986a0853e87eca86d14cdd6141a3d1
blob + 280be3f6230fb2de2e3b77a26030d2c313f5f696
--- lib/diff_patience.c
+++ lib/diff_patience.c
@@ -17,6 +17,13 @@
  */
 
 #include <assert.h>
+#include <inttypes.h>
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <diff/arraylist.h>
 #include <diff/diff_main.h>
 
 #include "debug.h"