From: Carlo Marcelo Arenas Belón Date: Mon, 20 Sep 2021 15:36:14 +0000 (+0000) Subject: simple-ipc: move definition of ipc_active_state outside of ifdef X-Git-Tag: v2.34.0-rc0~60^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59c923229e8b3b0ee30be37e2daf8aa6c91c7f34;p=thirdparty%2Fgit.git simple-ipc: move definition of ipc_active_state outside of ifdef Move the declartion of the `enum ipc_active_state` type outside of the SUPPORTS_SIMPLE_IPC ifdef. A later commit will introduce the `fsmonitor_ipc__*()` API and stub in a "mock" implementation that requires this enum in some function signatures. Signed-off-by: Carlo Marcelo Arenas Belón Signed-off-by: Jeff Hostetler Signed-off-by: Junio C Hamano --- diff --git a/simple-ipc.h b/simple-ipc.h index 9c7330fcda..b396293bdf 100644 --- a/simple-ipc.h +++ b/simple-ipc.h @@ -5,13 +5,6 @@ * See Documentation/technical/api-simple-ipc.txt */ -#ifdef SUPPORTS_SIMPLE_IPC -#include "pkt-line.h" - -/* - * Simple IPC Client Side API. - */ - enum ipc_active_state { /* * The pipe/socket exists and the daemon is waiting for connections. @@ -43,6 +36,13 @@ enum ipc_active_state { IPC_STATE__OTHER_ERROR, }; +#ifdef SUPPORTS_SIMPLE_IPC +#include "pkt-line.h" + +/* + * Simple IPC Client Side API. + */ + struct ipc_client_connect_options { /* * Spin under timeout if the server is running but can't