Re: [PATCH 3/7] simple-ipc: move definition of ipc_active_state outside of ifdef
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 15, 2021, 21:06 UTC
- Message-ID
- <xmqq5yv1wnuc.fsf@gitster.g>
- In-Reply-To
- <7de207828caa9e50906f39b955e39e9de2c1768f.1631738177.git.gitgitgadget@gmail.com>
"Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 6 quoted lines
> From: Jeff Hostetler <jeffhost@microsoft.com> > > From: Carlo Marcelo Arenas Belón <carenas@gmail.com> > > Move the declartion of the `enum ipc_active_state` type outside of > the SUPPORTS_SIMPLE_IPC ifdef.
The second one is not an in-body header since there is already a blank line that signals the end of in-body headers after the first one.
This _may_ be a bug in GGG, perhaps?
Show 42 quoted lines
> 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 <carenas@gmail.com>
> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
> ---
> simple-ipc.h | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/simple-ipc.h b/simple-ipc.h
> index 9c7330fcda0..b396293bdfc 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