summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund2020-06-19 02:40:09 +0000
committerAndres Freund2020-06-19 02:41:05 +0000
commitf219167910ad33dfd8f1b0bba15323d71a91c4e9 (patch)
treeb63fcc76ef851f25bd0c752c6aaabe51e405647e
parentcf1234a10e50ff9be0dc85184689ee4ebc57cd77 (diff)
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/[email protected]
-rw-r--r--src/backend/main/main.c1
-rw-r--r--src/include/storage/condition_variable.h2
-rw-r--r--src/include/storage/lwlock.h1
3 files changed, 1 insertions, 3 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index da3dae9e250..a4dd233c7f9 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 c2be198f28e..ad209acfac0 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 c04ae971485..af9b41795d2 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;