From 39357f4e89f4ac02eb11861812cbfc67b4f1d4ef Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 6 Jan 2010 12:37:20 +1030 Subject: [PATCH] More header fixups: now it all compiles again. --- ccan/ciniparser/ciniparser.c | 2 +- ccan/ciniparser/test/run-dictionary.c | 6 ++--- .../container_of/test/compile_fail-bad-type.c | 2 +- ccan/container_of/test/compile_fail-types.c | 2 +- .../test/compile_fail-var-types.c | 2 +- ccan/container_of/test/run.c | 4 ++-- ccan/crcsync/test/run-crash.c | 6 ++--- ccan/crcsync/test/run-crc.c | 6 ++--- ccan/crcsync/test/run-roll.c | 6 ++--- ccan/crcsync/test/run.c | 6 ++--- ccan/tdb/test/run-3G-file.c | 20 ++++++++--------- ccan/tdb/test/run-bad-tdb-header.c | 20 ++++++++--------- ccan/tdb/test/run-check.c | 22 +++++++++---------- ccan/tdb/test/run-corrupt.c | 22 +++++++++---------- ccan/tdb/test/run-endian.c | 20 ++++++++--------- ccan/tdb/test/run-nested-transactions.c | 20 ++++++++--------- ccan/tdb/test/run-nested-traverse.c | 20 ++++++++--------- ccan/tdb/test/run-traverse-in-transaction.c | 20 ++++++++--------- ccan/tdb/test/run-zero-append.c | 20 ++++++++--------- ccan/tdb/test/run.c | 20 ++++++++--------- ccan/wwviaudio/wwviaudio.c | 4 ++-- 21 files changed, 125 insertions(+), 125 deletions(-) diff --git a/ccan/ciniparser/ciniparser.c b/ccan/ciniparser/ciniparser.c index d801b736..5e27a253 100644 --- a/ccan/ciniparser/ciniparser.c +++ b/ccan/ciniparser/ciniparser.c @@ -33,7 +33,7 @@ */ #include -#include +#include #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 54c3dd7c..ea579ba1 100644 --- 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 +#include -#include "tap/tap.h" +#include 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 01dfd454..b7a14593 100644 --- 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 #include struct foo { diff --git a/ccan/container_of/test/compile_fail-types.c b/ccan/container_of/test/compile_fail-types.c index 69f02daf..a50b11c2 100644 --- 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 #include 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 5c776798..f9312b69 100644 --- 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 #include struct foo { diff --git a/ccan/container_of/test/run.c b/ccan/container_of/test/run.c index dd57204d..f28d9998 100644 --- 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 +#include struct foo { int a; diff --git a/ccan/crcsync/test/run-crash.c b/ccan/crcsync/test/run-crash.c index c2561e5d..b187bac4 100644 --- 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 */ -#include "crcsync/crcsync.h" -#include "crcsync/crcsync.c" -#include "tap/tap.h" +#include +#include +#include #include #include diff --git a/ccan/crcsync/test/run-crc.c b/ccan/crcsync/test/run-crc.c index fbbcd68b..70084cd1 100644 --- 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 +#include +#include int main(int argc, char *argv[]) { diff --git a/ccan/crcsync/test/run-roll.c b/ccan/crcsync/test/run-roll.c index a07a4506..95c50c1a 100644 --- 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 +#include +#include #include #include diff --git a/ccan/crcsync/test/run.c b/ccan/crcsync/test/run.c index ffc2bc1f..2c48b378 100644 --- 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 +#include +#include #include #include #include diff --git a/ccan/tdb/test/run-3G-file.c b/ccan/tdb/test/run-3G-file.c index 8b75f2b8..ba858c4d 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ccan/tdb/test/run-bad-tdb-header.c b/ccan/tdb/test/run-bad-tdb-header.c index 1b021003..08753402 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ccan/tdb/test/run-check.c b/ccan/tdb/test/run-check.c index 1518b4b4..dfba583f 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ccan/tdb/test/run-corrupt.c b/ccan/tdb/test/run-corrupt.c index 3b3cb617..3bf78835 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ccan/tdb/test/run-endian.c b/ccan/tdb/test/run-endian.c index 8899296c..6583c53c 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ccan/tdb/test/run-nested-transactions.c b/ccan/tdb/test/run-nested-transactions.c index 5c1ecfcd..50da919e 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/ccan/tdb/test/run-nested-traverse.c b/ccan/tdb/test/run-nested-traverse.c index 2d7193ef..e78a14ef 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/ccan/tdb/test/run-traverse-in-transaction.c b/ccan/tdb/test/run-traverse-in-transaction.c index 0043a98e..5b1c870c 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/ccan/tdb/test/run-zero-append.c b/ccan/tdb/test/run-zero-append.c index 287d74c3..35f4fbe3 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ccan/tdb/test/run.c b/ccan/tdb/test/run.c index 865eef8e..53057433 100644 --- 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ccan/wwviaudio/wwviaudio.c b/ccan/wwviaudio/wwviaudio.c index 870ffa59..6ce89577 100644 --- 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 +#include #define FRAMES_PER_BUFFER (1024) -- 2.39.2