From c4e4b1a97136f7a2047f8be6608cac0782dd6d12 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Thu, 26 Sep 2019 17:42:22 -0300 Subject: [PATCH 3/9] Silence 'mixed declarations and code' compiler warning --- src/backend/commands/typecmds.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index 14a6857062..26ed3e4c76 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -1782,14 +1782,10 @@ makeMultirangeConstructors(const char *name, Oid namespace, static const char *const prosrc[2] = {"multirange_constructor0", "multirange_constructor1"}; static const int pronargs[2] = {0, 1}; - - Oid constructorArgTypes[0]; + Oid constructorArgTypes = rangeArrayOid; ObjectAddress myself, referenced; int i; - - constructorArgTypes[0] = rangeArrayOid; - Datum allParamTypes[1] = {ObjectIdGetDatum(rangeArrayOid)}; ArrayType *allParameterTypes = construct_array(allParamTypes, 1, OIDOID, sizeof(Oid), true, 'i'); @@ -1808,7 +1804,7 @@ makeMultirangeConstructors(const char *name, Oid namespace, { oidvector *constructorArgTypesVector; - constructorArgTypesVector = buildoidvector(constructorArgTypes, + constructorArgTypesVector = buildoidvector(&constructorArgTypes, pronargs[i]); myself = ProcedureCreate(name, /* name: same as multirange type */ -- 2.17.1