diff options
| author | Andres Freund <andres@anarazel.de> | 2014-10-01 11:54:05 +0200 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2014-10-01 11:56:58 +0200 |
| commit | f78319fec8eb8aed34d6e1e43ca35fb0a9bfe108 (patch) | |
| tree | 9a0226c7779941aa3e41191a962d33c8e5b0d3cd /src/backend/access/transam/xlog.c | |
| parent | 721a8bb54602624b24d416f8d9b7b8f97701ecbd (diff) | |
| download | postgresql-f78319fec8eb8aed34d6e1e43ca35fb0a9bfe108.tar.gz postgresql-f78319fec8eb8aed34d6e1e43ca35fb0a9bfe108.zip | |
Rename CACHE_LINE_SIZE to PG_CACHE_LINE_SIZE.
As noted in http://bugs.debian.org/763098 there is a conflict between
postgres' definition of CACHE_LINE_SIZE and the definition by various
*bsd platforms. It's debatable who has the right to define such a
name, but postgres' use was only introduced in 375d8526f290 (9.4), so
it seems like a good idea to rename it.
Discussion: 20140930195756.GC27407@msg.df7cb.de
Per complaint of Christoph Berg in the above email, although he's not
the original bug reporter.
Backpatch to 9.4 where the define was introduced.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 7eea5fabaf5..9b938bda740 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -408,7 +408,7 @@ typedef struct typedef union WALInsertLockPadded { WALInsertLock l; - char pad[CACHE_LINE_SIZE]; + char pad[PG_CACHE_LINE_SIZE]; } WALInsertLockPadded; /* @@ -435,7 +435,7 @@ typedef struct XLogCtlInsert * read on every WAL insertion, but updated rarely, and we don't want * those reads to steal the cache line containing Curr/PrevBytePos. */ - char pad[CACHE_LINE_SIZE]; + char pad[PG_CACHE_LINE_SIZE]; /* * fullPageWrites is the master copy used by all backends to determine |