[Libguestfs] [nbdkit PATCH v3 01/15] src: Let internal.h handle common includes
There is no need to have all of the .c files under src/ include
nbdkit-plugin.h, since internal.h already handles this. Also,
this will make it easier when an upcoming patch updates the
public header to respond to a user-defined selection between
API levels; we want all of the files in src/ to see the latest
API, but it is easier to do this from the central location of
internal.h instead of repeated in each .c file.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/cleanup.c | 1 -
src/connections.c | 1 -
src/errors.c | 1 -
src/filters.c | 1 -
src/main.c | 1 -
src/plugins.c | 1 -
src/sockets.c | 1 -
src/threadlocal.c | 1 -
src/utils.c | 1 -
9 files changed, 9 deletions(-)
diff --git a/src/cleanup.c b/src/cleanup.c
index 3f7f8af..c68233d 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -38,7 +38,6 @@
#include <stdarg.h>
#include <string.h>
-#include "nbdkit-plugin.h"
#include "internal.h"
void
diff --git a/src/connections.c b/src/connections.c
index 75c2c2d..c25d316 100644
--- a/src/connections.c
+++ b/src/connections.c
@@ -46,7 +46,6 @@
#include <pthread.h>
-#include "nbdkit-plugin.h"
#include "internal.h"
#include "protocol.h"
diff --git a/src/errors.c b/src/errors.c
index dd3096c..afc5008 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -39,7 +39,6 @@
#include <string.h>
#include <errno.h>
-#include "nbdkit-plugin.h"
#include "internal.h"
/* Called with flockfile (stderr) taken. */
diff --git a/src/filters.c b/src/filters.c
index 40c4913..6949548 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -43,7 +43,6 @@
#include <dlfcn.h>
-#include "nbdkit-filter.h"
#include "internal.h"
/* We extend the generic backend struct with extra fields relating
diff --git a/src/main.c b/src/main.c
index 67cbbde..d2e5674 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,7 +57,6 @@
#include <dlfcn.h>
-#include "nbdkit-plugin.h"
#include "internal.h"
#define FIRST_SOCKET_ACTIVATION_FD 3 /* defined by systemd ABI */
diff --git a/src/plugins.c b/src/plugins.c
index 1b0816c..280887d 100644
--- a/src/plugins.c
+++ b/src/plugins.c
@@ -43,7 +43,6 @@
#include <dlfcn.h>
-#include "nbdkit-plugin.h"
#include "internal.h"
/* Maximum read or write request that we will handle. */
diff --git a/src/sockets.c b/src/sockets.c
index 0ea40a1..e3fa73d 100644
--- a/src/sockets.c
+++ b/src/sockets.c
@@ -52,7 +52,6 @@
#include <pthread.h>
-#include "nbdkit-plugin.h"
#include "internal.h"
static void
diff --git a/src/threadlocal.c b/src/threadlocal.c
index 267f348..be34d39 100644
--- a/src/threadlocal.c
+++ b/src/threadlocal.c
@@ -42,7 +42,6 @@
#include <pthread.h>
-#include "nbdkit-plugin.h"
#include "internal.h"
/* Note that most thread-local storage data is informational, used for
diff --git a/src/utils.c b/src/utils.c
index 0083370..63adbf1 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -43,7 +43,6 @@
#include <termios.h>
#include <errno.h>
-#include "nbdkit-plugin.h"
#include "internal.h"
char *
--
2.14.3