summaryrefslogtreecommitdiff
path: root/src/include/pg_config_manual.h
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2014-10-01 11:54:05 +0200
committerAndres Freund <andres@anarazel.de>2014-10-01 11:56:58 +0200
commitf78319fec8eb8aed34d6e1e43ca35fb0a9bfe108 (patch)
tree9a0226c7779941aa3e41191a962d33c8e5b0d3cd /src/include/pg_config_manual.h
parent721a8bb54602624b24d416f8d9b7b8f97701ecbd (diff)
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/include/pg_config_manual.h')
-rw-r--r--src/include/pg_config_manual.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index d1f99fbafef..ba17c4d1f25 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -216,7 +216,7 @@
* bytes of wasted memory. The default is 128, which should be large enough
* for all supported platforms.
*/
-#define CACHE_LINE_SIZE 128
+#define PG_CACHE_LINE_SIZE 128
/*
*------------------------------------------------------------------------