diff mbox series

[23/67] slirp: add include directory headers

Message ID	1525376963-79623-24-git-send-email-mst@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> Date: Thu, 3 May 2018 22:51:01 +0300 From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Message-ID: <1525376963-79623-24-git-send-email-mst@redhat.com> References: <1525376963-79623-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1525376963-79623-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH 23/67] slirp: add include directory headers Precedence: list Cc: kwolf@redhat.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	include path cleanup \| expand [00/67] include path cleanup [01/67] block: use local path for local headers [02/67] crypto: use local path for local headers [03/67] hppa: use local path for local headers [04/67] s390x: drop an unused include [05/67] migration: drop an unused include, add a used one [06/67] trace: use local path for local headers [07/67] display: use local path for local headers [08/67] ide: use local path for local headers [09/67] ioapic: fix up includes [10/67] e1000e: use local path for local headers [11/67] rocker: drop an unused include [12/67] ppc: use local path for local headers [13/67] vhost-scsi: drop an unused include [14/67] sd: fix up include [15/67] usb: use local path for local headers [16/67] migration: use local path for local headers [17/67] colo: use local path for local headers [18/67] qga: use local path for local headers [19/67] xtensa: relative include for parent directory [20/67] tests: relative include for child directory [21/67] trace: use local path for local headers [22/67] ui: use local path for local headers [23/67] slirp: add include directory headers [24/67] net: add include directory headers [25/67] arch_init: sort architectures [26/67] cpu: replace command line flags with preprocessor [27/67] replication: add include directory header [28/67] 9pfs: add include directory headers [29/67] fsdev: add include directory headers [31/67] target/cris: add include directory header [30/67] audio: add include directory header [32/67] ui: add include directory header [33/67] hw/net: add include directory header [34/67] hw/ppc: add include directory headers [35/67] hw/usb: add include directory header [36/67] migration: add include directory headers [37/67] tcg: add include directory headers [38/67] helper: replace command line flags with preprocessor [39/67] target: replace command line flags with preprocessor [40/67] trace: add include directory headers [42/67] tcg: use include "tcg.h" consistently [41/67] tcg-pool.inc.c: replace command line flags with preprocessor [43/67] translate-all: add include directory header [44/67] tcg-ldst.inc.c: replace command line flags with preprocessor [45/67] tcg: add include directory headers [46/67] cpu-qom: add include directory headers [47/67] tcg-op: use include "tcg.h" consistently [48/67] virtio-pci: add include directory header [49/67] kvm_XXX: add include directory headers [50/67] hmp: add include directory header [51/67] hyperv: add include directory header [52/67] target/arm: add include directory headers [53/67] target/ppc: add include directory headers [54/67] amd_iommu: add include directory header [55/67] amd_iommu: add include directory header [56/67] tcg: use include "tcg-gvec-desc.h.h" consistently [58/67] target/riscv: add include directory header [57/67] kvm: use include "kvm_i386.h" consistently [59/67] hw/ppc: add target headers explicitly [60/67] hw/s390x: add include directory headers [61/67] hw/net: add include directory header [62/67] kvm: use include "kvm_ppc.h" consistently [63/67] hw/s390x: use target headers explicitly [64/67] target/s390x: add include directory header [66/67] linux-user: add include directory header [65/67] tcg: use include "translate-all.h" consistently [67/67] make: simplify source include path

Commit Message

Michael S. Tsirkin May 3, 2018, 7:51 p.m. UTC

This way they are easier to find using standard rules.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/slirp/ip6.h      | 1 +
 include/slirp/libslirp.h | 1 +
 include/slirp/slirp.h    | 1 +
 3 files changed, 3 insertions(+)
 create mode 100644 include/slirp/ip6.h
 create mode 100644 include/slirp/libslirp.h
 create mode 100644 include/slirp/slirp.h

Comments

Samuel Thibault May 31, 2018, 6:50 p.m. UTC | #1

Hello,

Michael S. Tsirkin, le jeu. 03 mai 2018 22:51:01 +0300, a ecrit:
> +#include_next "../slirp/ip6.h"

Mmm, this is the first time #include_next would be used in qemu, and I
don't think this is a standard thing...

Samuel

Michael S. Tsirkin May 31, 2018, 7:25 p.m. UTC | #2

On Thu, May 31, 2018 at 08:50:32PM +0200, Samuel Thibault wrote:
> Hello,
> 
> Michael S. Tsirkin, le jeu. 03 mai 2018 22:51:01 +0300, a ecrit:
> > +#include_next "../slirp/ip6.h"
> 
> Mmm, this is the first time #include_next would be used in qemu, and I
> don't think this is a standard thing...
> 
> Samuel

Well we don't support arbitrary compilers, and
gcc and clang both have it.
It's also a temporary thing, then intent is for maintainers
to drop these after deciding on either code refactoring
or just moving header to include.

diff mbox series

Patch

diff --git a/include/slirp/ip6.h b/include/slirp/ip6.h
new file mode 100644
index 0000000..432cc36
--- /dev/null
+++ b/include/slirp/ip6.h
@@ -0,0 +1 @@ 
+#include_next "../slirp/ip6.h"
diff --git a/include/slirp/libslirp.h b/include/slirp/libslirp.h
new file mode 100644
index 0000000..acab168
--- /dev/null
+++ b/include/slirp/libslirp.h
@@ -0,0 +1 @@ 
+#include_next "../slirp/libslirp.h"
diff --git a/include/slirp/slirp.h b/include/slirp/slirp.h
new file mode 100644
index 0000000..826a97d
--- /dev/null
+++ b/include/slirp/slirp.h
@@ -0,0 +1 @@ 
+#include_next "../slirp/slirp.h"