@@ -51,7 +51,7 @@ void_PG_init(void);
5151
5252/* hooks defined in this module */
5353static void qs_ExecutorStart (QueryDesc * queryDesc ,int eflags );
54- #if PG_VERSION_NUM < 100000
54+ #if PG_VERSION_NUM < 100000 || PG_VERSION_NUM >= 180000
5555static void qs_ExecutorRun (QueryDesc * queryDesc ,ScanDirection direction ,uint64 count );
5656#else
5757static void qs_ExecutorRun (QueryDesc * queryDesc ,ScanDirection direction ,
@@ -101,8 +101,8 @@ static List *GetRemoteBackendQueryStates(PGPROC *leader,
101101ExplainFormat format );
102102
103103/* Shared memory variables */
104- shm_toc * toc = NULL ;
105- RemoteUserIdResult * counterpart_userid = NULL ;
104+ static shm_toc * toc = NULL ;
105+ static RemoteUserIdResult * counterpart_userid = NULL ;
106106pg_qs_params * params = NULL ;
107107shm_mq * mq = NULL ;
108108
@@ -296,7 +296,7 @@ qs_ExecutorStart(QueryDesc *queryDesc, int eflags)
296296 * Catch any fatal signals
297297 */
298298static void
299- #if PG_VERSION_NUM < 100000
299+ #if PG_VERSION_NUM < 100000 || PG_VERSION_NUM >= 180000
300300qs_ExecutorRun (QueryDesc * queryDesc ,ScanDirection direction ,uint64 count )
301301#else
302302qs_ExecutorRun (QueryDesc * queryDesc ,ScanDirection direction ,uint64 count ,
@@ -308,7 +308,7 @@ qs_ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count,
308308PG_TRY ();
309309{
310310if (prev_ExecutorRun )
311- #if PG_VERSION_NUM < 100000
311+ #if PG_VERSION_NUM < 100000 || PG_VERSION_NUM >= 180000
312312prev_ExecutorRun (queryDesc ,direction ,count );
313313else
314314standard_ExecutorRun (queryDesc ,direction ,count );
