Run "make autostyle" in advance of new series.

7 files changed, 8 insertions, 8 deletions

diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c
index 4f8b66e5f6..b1dc271c4a 100644
--- a/src/feature/control/control_cmd.c
+++ b/src/feature/control/control_cmd.c
@@ -52,7 +52,7 @@
 #include "feature/nodelist/node_st.h"
 #include "feature/nodelist/routerinfo_st.h"
 
-#include "src/app/config/statefile.h"
+#include "app/config/statefile.h"
 
 static int control_setconf_helper(control_connection_t *conn,
                                   const control_cmd_args_t *args,
diff --git a/src/feature/dircache/consdiffmgr.c b/src/feature/dircache/consdiffmgr.c
index 768a487fd1..9a3d4db560 100644
--- a/src/feature/dircache/consdiffmgr.c
+++ b/src/feature/dircache/consdiffmgr.c
@@ -183,9 +183,9 @@ static HT_HEAD(cdm_diff_ht, cdm_diff_t) cdm_diff_ht = HT_INITIALIZER();
    // diff manager becomes larger than 64. To see if the issue goes away, we
    // hardcode this value to 64 now while we investigate a better solution.
 #  define CACHE_MAX_NUM 64
-#else
+#else /* !defined(_WIN32) */
 #  define CACHE_MAX_NUM 128
-#endif
+#endif /* defined(_WIN32) */
 
 /**
  * Configuration for this module
diff --git a/src/feature/hs/hs_metrics_entry.h b/src/feature/hs/hs_metrics_entry.h
index dc8e7d165e..b9786ac6f7 100644
--- a/src/feature/hs/hs_metrics_entry.h
+++ b/src/feature/hs/hs_metrics_entry.h
@@ -46,6 +46,6 @@ typedef struct hs_metrics_entry_t {
 extern const hs_metrics_entry_t base_metrics[];
 extern const size_t base_metrics_size;
 
-#endif /* HS_METRICS_ENTRY_PRIVATE */
+#endif /* defined(HS_METRICS_ENTRY_PRIVATE) */
 
 #endif /* !defined(TOR_FEATURE_HS_METRICS_ENTRY_H) */
diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h
index eb4c3ccfae..cb08531782 100644
--- a/src/feature/relay/relay_config.h
+++ b/src/feature/relay/relay_config.h
@@ -93,7 +93,7 @@ STATIC int have_enough_mem_for_dircache(const struct or_options_t *options,
 struct port_cfg_t;
 STATIC const char *describe_relay_port(const struct port_cfg_t *port);
 
-#endif /* TOR_UNIT_TESTS */
+#endif /* defined(TOR_UNIT_TESTS) */
 
 #endif /* defined(RELAY_CONFIG_PRIVATE) */
 
diff --git a/src/feature/relay/relay_find_addr.h b/src/feature/relay/relay_find_addr.h
index 82f4f68974..5bb7f8736e 100644
--- a/src/feature/relay/relay_find_addr.h
+++ b/src/feature/relay/relay_find_addr.h
@@ -28,5 +28,5 @@ void relay_addr_learn_from_dirauth(void);
 
 #endif /* RELAY_FIND_ADDR_PRIVATE */
 
-#endif /* TOR_RELAY_FIND_ADDR_H */
+#endif /* !defined(TOR_RELAY_FIND_ADDR_H) */
 
diff --git a/src/feature/stats/bwhist.h b/src/feature/stats/bwhist.h
index dc46a7665a..e7fc60fdee 100644
--- a/src/feature/stats/bwhist.h
+++ b/src/feature/stats/bwhist.h
@@ -38,7 +38,7 @@ STATIC void add_obs(bw_array_t *b, time_t when, uint64_t n);
 STATIC void bw_array_free_(bw_array_t *b);
 STATIC size_t bwhist_fill_bandwidth_history(char *buf, size_t len,
                                             const bw_array_t *b);
-#endif /* defined(REPHIST_PRIVATE) */
+#endif /* defined(BWHIST_PRIVATE) */
 
 #ifdef TOR_UNIT_TESTS
 extern struct bw_array_t *write_array;
diff --git a/src/feature/stats/rephist.h b/src/feature/stats/rephist.h
index 14ab3e7666..26fb207d6f 100644
--- a/src/feature/stats/rephist.h
+++ b/src/feature/stats/rephist.h
@@ -145,6 +145,6 @@ struct hs_v2_stats_t;
 const struct hs_v2_stats_t *rep_hist_get_hs_v2_stats(void);
 struct hs_v3_stats_t;
 const struct hs_v3_stats_t *rep_hist_get_hs_v3_stats(void);
-#endif
+#endif /* defined(TOR_UNIT_TESTS) */
 
 #endif /* !defined(TOR_REPHIST_H) */