Fix compilation without injection points with some compilers

Some compilers didn't like the empty initializer when compiled without
USE_INJECTION_POINTS. Per buildfarm member 'drongo', using Visual
Studio 2019.

Author: Michael Paquier <michael@paquier.xyz>
Discussion: https://www.postgresql.org/message-id/adNHcBVJO5gIOp1l@paquier.xyz

diff --git a/src/backend/utils/misc/injection_point.c b/src/backend/utils/misc/injection_point.c
index a7c99e097ea46e111ced146afb7f88b894bf70dc..aa455c62bcc0872b1770ffd3eb4d145cb37e00bb 100644 (file)
--- a/src/backend/utils/misc/injection_point.c
+++ b/src/backend/utils/misc/injection_point.c
@@ -230,19 +230,15 @@ injection_point_cache_get(const char *name)
 
        return NULL;
 }
-#endif                                                 /* USE_INJECTION_POINTS */
 
 const ShmemCallbacks InjectionPointShmemCallbacks = {
-#ifdef USE_INJECTION_POINTS
        .request_fn = InjectionPointShmemRequest,
        .init_fn = InjectionPointShmemInit,
-#endif
 };
 
 /*
  * Reserve space for the dynamic shared hash table
  */
-#ifdef USE_INJECTION_POINTS
 static void
 InjectionPointShmemRequest(void *arg)
 {
@@ -259,7 +255,7 @@ InjectionPointShmemInit(void *arg)
        for (int i = 0; i < MAX_INJECTION_POINTS; i++)
                pg_atomic_init_u64(&ActiveInjectionPoints->entries[i].generation, 0);
 }
-#endif
+#endif                                                 /* USE_INJECTION_POINTS */
 
 /*
  * Attach a new injection point.

diff --git a/src/include/storage/subsystemlist.h b/src/include/storage/subsystemlist.h
index 5e092552c7257e655700512f9a7ceb9dfb45a388..9ad619080be22df55f0410b68f4fe175a884be28 100644 (file)
--- a/src/include/storage/subsystemlist.h
+++ b/src/include/storage/subsystemlist.h
@@ -79,7 +79,9 @@ PG_SHMEM_SUBSYSTEM(SyncScanShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(AsyncShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(StatsShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(WaitEventCustomShmemCallbacks)
+#ifdef USE_INJECTION_POINTS
 PG_SHMEM_SUBSYSTEM(InjectionPointShmemCallbacks)
+#endif
 PG_SHMEM_SUBSYSTEM(WaitLSNShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(LogicalDecodingCtlShmemCallbacks)
 PG_SHMEM_SUBSYSTEM(DataChecksumsShmemCallbacks)