From 83079e46bcc4e0ec925d1d1038ff5ac6cb0b77b7 Mon Sep 17 00:00:00 2001
From: gurkanindibay <gindibay@microsoft.com>
Date: Wed, 17 Jan 2024 12:51:48 +0300
Subject: [PATCH] Fixes postgres start error

---
 src/backend/distributed/commands/parameter.c               | 6 +++---
 src/backend/distributed/deparser/deparse_parameter_stmts.c | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/backend/distributed/commands/parameter.c b/src/backend/distributed/commands/parameter.c
index 65c806c43..8e82f8e0b 100644
--- a/src/backend/distributed/commands/parameter.c
+++ b/src/backend/distributed/commands/parameter.c
@@ -1,7 +1,7 @@
-#include "pg_version_constants.h"
-#if PG_VERSION_NUM >= PG_VERSION_15
 #include "postgres.h"
 
+#include "pg_version_constants.h"
+#if PG_VERSION_NUM >= PG_VERSION_15
 #include "access/genam.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_parameter_acl.h"
@@ -109,7 +109,7 @@ CheckPermissionsAndGrants(AclItem *aclItem, AclMode modes[], int numModes)
 		AclMode mode = modes[i];
 		if (!(grants & mode) || (permissions & mode))
 		{
-			ereport(ERROR, (errmsg("ACL item has no grant option for mode %lu", mode)));
+			ereport(ERROR, (errmsg("ACL item has no grant option for mode %u", mode)));
 		}
 	}
 }
diff --git a/src/backend/distributed/deparser/deparse_parameter_stmts.c b/src/backend/distributed/deparser/deparse_parameter_stmts.c
index 7c4d5b464..87a7fdb9e 100644
--- a/src/backend/distributed/deparser/deparse_parameter_stmts.c
+++ b/src/backend/distributed/deparser/deparse_parameter_stmts.c
@@ -6,9 +6,10 @@
  * -------------------------------------------------------------------------
  */
 
+#include "postgres.h"
+
 #include "pg_version_constants.h"
 #if PG_VERSION_NUM >= PG_VERSION_15
-#include "postgres.h"
 
 #include "utils/builtins.h"