diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index c0cf0336a1e62408f1fd7b9102c9f26c17eaba98..0d98b7ec2699b155fd8708e75f423bfb8f71c345 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3795,7 +3795,7 @@ internal_forkexec(int argc, char *argv[], Port *port)
 
 	/* Insert temp file name after --fork argument */
 #ifdef _WIN64
-	sprintf(paramHandleStr, "%llu", (LONG_PTR) paramHandle);
+	sprintf(paramHandleStr, UINT64_FORMAT, (LONG_PTR) paramHandle);
 #else
 	sprintf(paramHandleStr, "%lu", (DWORD) paramHandle);
 #endif
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 970fa935099707c219325b0f7b4a28ea174e1fdc..0e908c99b063c308f267f88f9a58e53b52b7e847 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -689,12 +689,12 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
 					strcpy(mallocedval, "array [");
 
 					for (element = 0; element < asize; element++)
-						sprintf(mallocedval + strlen(mallocedval), "%lld,", ((long long int *) var->value)[element]);
+						sprintf(mallocedval + strlen(mallocedval), INT64_FORMAT ",", ((long long int *) var->value)[element]);
 
 					strcpy(mallocedval + strlen(mallocedval) - 1, "]");
 				}
 				else
-					sprintf(mallocedval, "%lld", *((long long int *) var->value));
+					sprintf(mallocedval, INT64_FORMAT, *((long long int *) var->value));
 
 				*tobeinserted_p = mallocedval;
 				break;
@@ -708,12 +708,12 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
 					strcpy(mallocedval, "array [");
 
 					for (element = 0; element < asize; element++)
-						sprintf(mallocedval + strlen(mallocedval), "%llu,", ((unsigned long long int *) var->value)[element]);
+						sprintf(mallocedval + strlen(mallocedval), UINT64_FORMAT ",", ((unsigned long long int *) var->value)[element]);
 
 					strcpy(mallocedval + strlen(mallocedval) - 1, "]");
 				}
 				else
-					sprintf(mallocedval, "%llu", *((unsigned long long int *) var->value));
+					sprintf(mallocedval, UINT64_FORMAT, *((unsigned long long int *) var->value));
 
 				*tobeinserted_p = mallocedval;
 				break;