From f219167910ad33dfd8f1b0bba15323d71a91c4e9 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Thu, 18 Jun 2020 19:40:09 -0700 Subject: [PATCH] Clean up includes of s_lock.h. Users of spinlocks should use spin.h, not s_lock.h. And lwlock.h hasn't utilized spinlocks for quite a while. Discussion: https://postgr.es/m/20200618183041.upyrd25eosecyf3x@alap3.anarazel.de --- src/backend/main/main.c | 1 - src/include/storage/condition_variable.h | 2 +- src/include/storage/lwlock.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/backend/main/main.c b/src/backend/main/main.c index da3dae9e25..a4dd233c7f 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -35,7 +35,6 @@ #include "common/username.h" #include "port/atomics.h" #include "postmaster/postmaster.h" -#include "storage/s_lock.h" #include "storage/spin.h" #include "tcop/tcopprot.h" #include "utils/help_config.h" diff --git a/src/include/storage/condition_variable.h b/src/include/storage/condition_variable.h index c2be198f28..ad209acfac 100644 --- a/src/include/storage/condition_variable.h +++ b/src/include/storage/condition_variable.h @@ -23,7 +23,7 @@ #define CONDITION_VARIABLE_H #include "storage/proclist_types.h" -#include "storage/s_lock.h" +#include "storage/spin.h" typedef struct { diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index c04ae97148..af9b41795d 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.h @@ -20,7 +20,6 @@ #include "port/atomics.h" #include "storage/proclist_types.h" -#include "storage/s_lock.h" struct PGPROC; -- 2.39.5