Re: [PATCH 3/7] simple-ipc: move definition of ipc_active_state outside of ifdef

3 messages, 3 authors, 2021-09-18 · open the first message on its own page

Re: [PATCH 3/7] simple-ipc: move definition of ipc_active_state outside of ifdef

From: Junio C Hamano <hidden>
Date: 2021-09-15 21:06:26

"Jeff Hostetler via GitGitGadget" [off-list ref] writes:
From: Jeff Hostetler <redacted>

From: Carlo Marcelo Arenas Belón <redacted>

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?

quoted hunk
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 <redacted>
Signed-off-by: Jeff Hostetler <redacted>
---
 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

Re: [PATCH 3/7] simple-ipc: move definition of ipc_active_state outside of ifdef

From: Jeff Hostetler <hidden>
Date: 2021-09-17 16:58:44


On 9/15/21 5:06 PM, Junio C Hamano wrote:
"Jeff Hostetler via GitGitGadget" [off-list ref] writes:
quoted
From: Jeff Hostetler <redacted>

From: Carlo Marcelo Arenas Belón <redacted>

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

Re: [PATCH 3/7] simple-ipc: move definition of ipc_active_state outside of ifdef

From: Carlo Arenas <hidden>
Date: 2021-09-18 07:03:31

On Fri, Sep 17, 2021 at 11:39 PM Jeff Hostetler [off-list ref] 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help