| Message ID | 7de207828caa9e50906f39b955e39e9de2c1768f.1631738177.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Builtin FSMonitor Part 1 | expand |
"Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes: > 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? > 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
On 9/15/21 5:06 PM, Junio C Hamano wrote: > "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes: > >> 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? Maybe. I'll make a note to ask @dscho when he gets back from vacation. Credit for the commit should go to Carlo. I just added it to the series with his "From:" line and it looks like GGG added an extra one before it. Jeff
On Fri, Sep 17, 2021 at 11:39 PM Jeff Hostetler <git@jeffhostetler.com> wrote: > > Maybe. I'll make a note to ask @dscho when he gets back from vacation. I am actually more worried about GGG introducing a typo in my flawless commit message. Carlo
Jeff Hostetler <git@jeffhostetler.com> writes: > On 9/15/21 5:06 PM, Junio C Hamano wrote: >> "Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes: >> >>> 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? > > Maybe. I'll make a note to ask @dscho when he gets back from vacation. > > Credit for the commit should go to Carlo. I just added it to the series > with his "From:" line and it looks like GGG added an extra one before > it. Thanks for a clarification. I'll tweak the authorship when queuing.
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