Clean up includes of s_lock.h.

anarazel · anarazel · commit f219167910ad · 2020-06-18T19:41:05.000-07:00
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
diff --git 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
@@ -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
@@ -20,7 +20,6 @@
 
 #include "port/atomics.h"
 #include "storage/proclist_types.h"
-#include "storage/s_lock.h"
 
 struct PGPROC;
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#define CONDITION_VARIABLE_H`
`24`	`24`
`25`	`25`	`#include "storage/proclist_types.h"`
`26`		`-#include "storage/s_lock.h"`
	`26`	`+#include "storage/spin.h"`
`27`	`27`
`28`	`28`	`typedef struct`
`29`	`29`	`{`