Multiple include guards for origin.h

ringerc · ringerc · commit 0c0c7a8bd872 · 2015-12-25T19:16:27.000+08:00
Handle repeated inclusion for origin.h and avoid redefining the
RepOriginId typedef if it's already been defined by pglogical_output's
compat headers.

C89 doesn't allow typedef redefinition, though newer gcc is more
permissive and C11 will allow it. This would break on RHEL6 but
not newer platforms.
diff --git a/compat/replication/origin.h b/compat/replication/origin.h
@@ -1,5 +1,10 @@
+#ifndef PGLOGICAL_COMPAT_REPLICATION_ORIGIN_H
+#define PGLOGICAL_COMPAT_REPLICATION_ORIGIN_H
+
+#ifndef InvalidRepOriginId
 typedef uint16 RepOriginId;
 #define InvalidRepOriginId 0
+#endif
 
 extern PGDLLIMPORT RepOriginId replorigin_session_origin;
 extern PGDLLIMPORT XLogRecPtr replorigin_session_origin_lsn;
@@ -17,3 +22,5 @@ extern void replorigin_advance(RepOriginId node,
 				   XLogRecPtr remote_commit,
 				   XLogRecPtr local_commit,
 				   bool go_backward, bool wal_log);
+
+#endif
