diff options
| author | Tom Lane | 2011-08-06 18:53:49 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-08-06 18:53:49 +0000 |
| commit | 05e83968929f4ec1eba058fcae755fd2df98864e (patch) | |
| tree | 7ffac5eb9aa9587d20a60d8fac592763f7ae7bac /src/backend/replication | |
| parent | ffcf5a6c41ce91c55991b04eea1fcb94e4d0faa0 (diff) | |
Clean up ill-advised attempt to invent a private set of Node tags.
Somebody thought it'd be cute to invent a set of Node tag numbers that were
defined independently of, and indeed conflicting with, the main tag-number
list. While this accidentally failed to fail so far, it would certainly
lead to trouble as soon as anyone wanted to, say, apply copyObject to these
node types. Clang was already complaining about the use of makeNode on
these tags, and I think quite rightly so. Fix by pushing these node
definitions into the mainstream, including putting replnodes.h where it
belongs.
Diffstat (limited to 'src/backend/replication')
| -rw-r--r-- | src/backend/replication/repl_gram.y | 4 | ||||
| -rw-r--r-- | src/backend/replication/walsender.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/replication/repl_gram.y b/src/backend/replication/repl_gram.y index 4930ad1d097..d99708ca8eb 100644 --- a/src/backend/replication/repl_gram.y +++ b/src/backend/replication/repl_gram.y @@ -16,10 +16,10 @@ #include "postgres.h" #include "nodes/makefuncs.h" -#include "nodes/parsenodes.h" -#include "replication/replnodes.h" +#include "nodes/replnodes.h" #include "replication/walsender.h" + /* Result of the parsing is returned here */ Node *replication_parse_result; diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 63a63048dbb..7f83a32c0c4 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -37,16 +37,16 @@ #include <signal.h> #include <unistd.h> -#include "funcapi.h" -#include "access/xlog_internal.h" #include "access/transam.h" +#include "access/xlog_internal.h" #include "catalog/pg_type.h" +#include "funcapi.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "libpq/pqsignal.h" #include "miscadmin.h" +#include "nodes/replnodes.h" #include "replication/basebackup.h" -#include "replication/replnodes.h" #include "replication/walprotocol.h" #include "replication/walreceiver.h" #include "replication/walsender.h" |