More header fixups: now it all compiles again.

diff --git a/ccan/ciniparser/ciniparser.c b/ccan/ciniparser/ciniparser.c
index d801b736eede829592734fdf4076890205406f34..5e27a25333a0b49e72c88d0e25606ef8f4ac8e55 100644 (file)
--- a/ccan/ciniparser/ciniparser.c
+++ b/ccan/ciniparser/ciniparser.c
@@ -33,7 +33,7 @@
  */
 
 #include <ctype.h>
-#include <ccan/ccan/ciniparser.h>
+#include <ccan/ciniparser/ciniparser.h>
 
 #define ASCIILINESZ      (1024)
 #define INI_INVALID_KEY  ((char*) NULL)

diff --git a/ccan/ciniparser/test/run-dictionary.c b/ccan/ciniparser/test/run-dictionary.c
index 54c3dd7cddd48030c9e824d60f4badb7f6a017a2..ea579ba152f28ecc9385edb96bbeabcb2e25174d 100644 (file)
--- a/ccan/ciniparser/test/run-dictionary.c
+++ b/ccan/ciniparser/test/run-dictionary.c
@@ -1,7 +1,7 @@
-#include "ciniparser/dictionary.h"
-#include "ciniparser/dictionary.c"
+#include <ccan/ciniparser/dictionary.h>
+#include <ccan/ciniparser/dictionary.c>
 
-#include "tap/tap.h"
+#include <ccan/tap/tap.h>
 
 static void test_trivial(void) {
        dictionary *map = dictionary_new(0);

diff --git a/ccan/container_of/test/compile_fail-bad-type.c b/ccan/container_of/test/compile_fail-bad-type.c
index 01dfd454597d0eb7d43244a3af81396e1648fc70..b7a1459386b2d53c8f650388073f7e40f1934897 100644 (file)
--- a/ccan/container_of/test/compile_fail-bad-type.c
+++ b/ccan/container_of/test/compile_fail-bad-type.c
@@ -1,4 +1,4 @@
-#include "container_of/container_of.h"
+#include <ccan/container_of/container_of.h>
 #include <stdlib.h>
 
 struct foo {

diff --git a/ccan/container_of/test/compile_fail-types.c b/ccan/container_of/test/compile_fail-types.c
index 69f02daf289d3ff8cfe82db09029f49f777babac..a50b11c2b36b69e3dadd8766916a2eabb96f825a 100644 (file)
--- a/ccan/container_of/test/compile_fail-types.c
+++ b/ccan/container_of/test/compile_fail-types.c
@@ -1,4 +1,4 @@
-#include "container_of/container_of.h"
+#include <ccan/container_of/container_of.h>
 #include <stdlib.h>
 
 struct foo {

diff --git a/ccan/container_of/test/compile_fail-var-types.c b/ccan/container_of/test/compile_fail-var-types.c
index 5c7767985223b62259a7cea1c08c0dd8e60fc630..f9312b69b3a0486f0b07506781638c3e09cfce89 100644 (file)
--- a/ccan/container_of/test/compile_fail-var-types.c
+++ b/ccan/container_of/test/compile_fail-var-types.c
@@ -1,4 +1,4 @@
-#include "container_of/container_of.h"
+#include <ccan/container_of/container_of.h>
 #include <stdlib.h>
 
 struct foo {

diff --git a/ccan/container_of/test/run.c b/ccan/container_of/test/run.c
index dd57204d88f839bd15bbe16c3177c9871e00d492..f28d9998503dc63e482355927fe66ebfbe445b9d 100644 (file)
--- a/ccan/container_of/test/run.c
+++ b/ccan/container_of/test/run.c
@@ -1,5 +1,5 @@
-#include "container_of/container_of.h"
-#include "tap/tap.h"
+#include <ccan/container_of/container_of.h>
+#include <ccan/tap/tap.h>
 
 struct foo {
        int a;

diff --git a/ccan/crcsync/test/run-crash.c b/ccan/crcsync/test/run-crash.c
index c2561e5d69134862aca8bd651186d18a9cd5858a..b187bac401be4f7ce4676aaa6c68c72704bd1d3f 100644 (file)
--- a/ccan/crcsync/test/run-crash.c
+++ b/ccan/crcsync/test/run-crash.c
@@ -1,8 +1,8 @@
 /* This used to crash us on 64-bit; submitted by
    Alex Wulms <alex.wulms@scarlet.be> */
-#include "crcsync/crcsync.h"
-#include "crcsync/crcsync.c"
-#include "tap/tap.h"
+#include <ccan/crcsync/crcsync.h>
+#include <ccan/crcsync/crcsync.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>
 

diff --git a/ccan/crcsync/test/run-crc.c b/ccan/crcsync/test/run-crc.c
index fbbcd68b5d487a07b3fdfcc61a57498ca8c76008..70084cd14939dd7ae45752972773f4c1467c3f9d 100644 (file)
--- a/ccan/crcsync/test/run-crc.c
+++ b/ccan/crcsync/test/run-crc.c
@@ -1,6 +1,6 @@
-#include "crcsync/crcsync.h"
-#include "crcsync/crcsync.c"
-#include "tap/tap.h"
+#include <ccan/crcsync/crcsync.h>
+#include <ccan/crcsync/crcsync.c>
+#include <ccan/tap/tap.h>
 
 int main(int argc, char *argv[])
 {

diff --git a/ccan/crcsync/test/run-roll.c b/ccan/crcsync/test/run-roll.c
index a07a450683197a8d6028f88b5832e4cefe2a6294..95c50c1abe93a9c4deee4200291d3df9998c39e3 100644 (file)
--- a/ccan/crcsync/test/run-roll.c
+++ b/ccan/crcsync/test/run-roll.c
@@ -1,6 +1,6 @@
-#include "crcsync/crcsync.h"
-#include "crcsync/crcsync.c"
-#include "tap/tap.h"
+#include <ccan/crcsync/crcsync.h>
+#include <ccan/crcsync/crcsync.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>
 

diff --git a/ccan/crcsync/test/run.c b/ccan/crcsync/test/run.c
index ffc2bc1f5517444fbdf345e246438a11e14ee8dc..2c48b37804a1a76bd925c9d278c868ade97a6547 100644 (file)
--- a/ccan/crcsync/test/run.c
+++ b/ccan/crcsync/test/run.c
@@ -1,6 +1,6 @@
-#include "crcsync/crcsync.h"
-#include "../crcsync.c"
-#include "tap/tap.h"
+#include <ccan/crcsync/crcsync.h>
+#include <ccan/crcsync/crcsync.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>

diff --git a/ccan/tdb/test/run-3G-file.c b/ccan/tdb/test/run-3G-file.c
index 8b75f2b8eb632e5c82f716dfeea783c5f9b68cd5..ba858c4d59fce5afe7ce047bc2eac89fa2750e17 100644 (file)
--- a/ccan/tdb/test/run-3G-file.c
+++ b/ccan/tdb/test/run-3G-file.c
@@ -1,16 +1,16 @@
 /* We need this otherwise fcntl locking fails. */
 #define _FILE_OFFSET_BITS 64
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
 

diff --git a/ccan/tdb/test/run-bad-tdb-header.c b/ccan/tdb/test/run-bad-tdb-header.c
index 1b021003a559ab7499945e9410fa50708c27e9b0..08753402470e33f993c87e25a8f5b78f43fc3a98 100644 (file)
--- a/ccan/tdb/test/run-bad-tdb-header.c
+++ b/ccan/tdb/test/run-bad-tdb-header.c
@@ -1,14 +1,14 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
 

diff --git a/ccan/tdb/test/run-check.c b/ccan/tdb/test/run-check.c
index 1518b4b4b9c320ba818117b3f77ce1adad654b86..dfba583fc8a20f9e06a547f389f27b4749e3eb9f 100644 (file)
--- a/ccan/tdb/test/run-check.c
+++ b/ccan/tdb/test/run-check.c
@@ -1,15 +1,15 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tdb/check.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tdb/check.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
 

diff --git a/ccan/tdb/test/run-corrupt.c b/ccan/tdb/test/run-corrupt.c
index 3b3cb61747d0af7c7e79d7130ff6f2c32dfa2d21..3bf78835527992f6e16b557b5da947fe06f4bcb6 100644 (file)
--- a/ccan/tdb/test/run-corrupt.c
+++ b/ccan/tdb/test/run-corrupt.c
@@ -1,15 +1,15 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tdb/check.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tdb/check.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
 

diff --git a/ccan/tdb/test/run-endian.c b/ccan/tdb/test/run-endian.c
index 8899296c2aeba6232093ee773218c480e92cbc31..6583c53ce0b06c778e7889cab831281a410d3d82 100644 (file)
--- a/ccan/tdb/test/run-endian.c
+++ b/ccan/tdb/test/run-endian.c
@@ -1,14 +1,14 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
 

diff --git a/ccan/tdb/test/run-nested-transactions.c b/ccan/tdb/test/run-nested-transactions.c
index 5c1ecfcd23e26f874bf7dc64c620c06a77fcec77..50da919e24001db187bd17d1cee3d997ef8125e3 100644 (file)
--- a/ccan/tdb/test/run-nested-transactions.c
+++ b/ccan/tdb/test/run-nested-transactions.c
@@ -1,14 +1,14 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>

diff --git a/ccan/tdb/test/run-nested-traverse.c b/ccan/tdb/test/run-nested-traverse.c
index 2d7193efcc407027c93dc4d6d5fbb0fc519c9502..e78a14efddc49ca9bbbc05f687e47774c84beae4 100644 (file)
--- a/ccan/tdb/test/run-nested-traverse.c
+++ b/ccan/tdb/test/run-nested-traverse.c
@@ -1,14 +1,14 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>

diff --git a/ccan/tdb/test/run-traverse-in-transaction.c b/ccan/tdb/test/run-traverse-in-transaction.c
index 0043a98eaf3a714b2f99adc9b7bb04cd5423a11e..5b1c870c7f7a04ddeeaa8b67de2874693df93eff 100644 (file)
--- a/ccan/tdb/test/run-traverse-in-transaction.c
+++ b/ccan/tdb/test/run-traverse-in-transaction.c
@@ -1,14 +1,14 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>

diff --git a/ccan/tdb/test/run-zero-append.c b/ccan/tdb/test/run-zero-append.c
index 287d74c37a360da86d78f7cad04c0ddb00bfc939..35f4fbe32cf4d824172ac169d2a95af7d3b50810 100644 (file)
--- a/ccan/tdb/test/run-zero-append.c
+++ b/ccan/tdb/test/run-zero-append.c
@@ -1,14 +1,14 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
 

diff --git a/ccan/tdb/test/run.c b/ccan/tdb/test/run.c
index 865eef8e9cc74a67e1e0d7e7165cb156030e8561..53057433d50037e922fb49a4fdf9ac8cecc67471 100644 (file)
--- a/ccan/tdb/test/run.c
+++ b/ccan/tdb/test/run.c
@@ -1,14 +1,14 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#include <ccan/tdb/transaction.c>
+#include <ccan/tdb/error.c>
+#include <ccan/tdb/open.c>
+#include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <err.h>
 

diff --git a/ccan/wwviaudio/wwviaudio.c b/ccan/wwviaudio/wwviaudio.c
index 870ffa59b8923ee28d671610ec30f208c313c27e..6ce89577fd22df7a451b231e7dd4ad25f5d9ca7d 100644 (file)
--- a/ccan/wwviaudio/wwviaudio.c
+++ b/ccan/wwviaudio/wwviaudio.c
@@ -34,8 +34,8 @@
 #include "wwviaudio.h"
 #undef WWVIAUDIO_DEFINE_GLOBALS
 
-#include "portaudio.h"
-#include "ccan/ogg_to_pcm/ogg_to_pcm.h"
+#include <portaudio.h>
+#include <ccan/ogg_to_pcm/ogg_to_pcm.h>
 
 #define FRAMES_PER_BUFFER  (1024)