The outer #define was forgotten.  Attached patch adds it; please apply.
The outer #define was forgotten.  Attached patch adds it; please apply.

Alvaro

ashwinstar/gpdb,janebeckman/gpdb,adam8157/gpdb,randomtask1155/gpdb,randomtask1155/gpdb,CraigHarris/gpdb,foyzur/gpdb,ashwinstar/gpdb,atris/gpdb,Postgres-XL/Postgres-XL,CraigHarris/gpdb,rubikloud/gpdb,Chibin/gpdb,cjcjameson/gpdb,edespino/gpdb,lpetrov-pivotal/gpdb,royc1/gpdb,randomtask1155/gpdb,yazun/postgres-xl,50wu/gpdb,snaga/postgres-xl,lisakowen/gpdb,janebeckman/gpdb,50wu/gpdb,randomtask1155/gpdb,cjcjameson/gpdb,ahachete/gpdb,lintzc/gpdb,xinzweb/gpdb,arcivanov/postgres-xl,lpetrov-pivotal/gpdb,Postgres-XL/Postgres-XL,xuegang/gpdb,xuegang/gpdb,rvs/gpdb,lintzc/gpdb,lpetrov-pivotal/gpdb,xuegang/gpdb,foyzur/gpdb,xuegang/gpdb,greenplum-db/gpdb,tpostgres-projects/tPostgres,CraigHarris/gpdb,adam8157/gpdb,Quikling/gpdb,kmjungersen/PostgresXL,pavanvd/postgres-xl,lisakowen/gpdb,edespino/gpdb,Chibin/gpdb,chrishajas/gpdb,postmind-net/postgres-xl,yuanzhao/gpdb,atris/gpdb,kmjungersen/PostgresXL,lisakowen/gpdb,chrishajas/gpdb,lisakowen/gpdb,xuegang/gpdb,techdragon/Postgres-XL,randomtask1155/gpdb,xuegang/gpdb,kaknikhil/gpdb,cjcjameson/gpdb,Chibin/gpdb,foyzur/gpdb,CraigHarris/gpdb,Chibin/gpdb,tpostgres-projects/tPostgres,ahachete/gpdb,Quikling/gpdb,lintzc/gpdb,kmjungersen/PostgresXL,zeroae/postgres-xl,kaknikhil/gpdb,rubikloud/gpdb,lpetrov-pivotal/gpdb,janebeckman/gpdb,oberstet/postgres-xl,rvs/gpdb,atris/gpdb,foyzur/gpdb,ashwinstar/gpdb,lisakowen/gpdb,tangp3/gpdb,Chibin/gpdb,ashwinstar/gpdb,yuanzhao/gpdb,0x0FFF/gpdb,jmcatamney/gpdb,xuegang/gpdb,rubikloud/gpdb,pavanvd/postgres-xl,ahachete/gpdb,kaknikhil/gpdb,0x0FFF/gpdb,ahachete/gpdb,CraigHarris/gpdb,snaga/postgres-xl,foyzur/gpdb,jmcatamney/gpdb,zaksoup/gpdb,yazun/postgres-xl,0x0FFF/gpdb,yazun/postgres-xl,xuegang/gpdb,postmind-net/postgres-xl,atris/gpdb,janebeckman/gpdb,rvs/gpdb,greenplum-db/gpdb,zeroae/postgres-xl,adam8157/gpdb,Chibin/gpdb,Postgres-XL/Postgres-XL,rvs/gpdb,0x0FFF/gpdb,Quikling/gpdb,foyzur/gpdb,royc1/gpdb,Quikling/gpdb,atris/gpdb,cjcjameson/gpdb,ahachete/gpdb,pavanvd/postgres-xl,cjcjameson/gpdb,lisakowen/gpdb,50wu/gpdb,oberstet/postgres-xl,xinzweb/gpdb,greenplum-db/gpdb,ashwinstar/gpdb,royc1/gpdb,lintzc/gpdb,arcivanov/postgres-xl,CraigHarris/gpdb,CraigHarris/gpdb,0x0FFF/gpdb,xinzweb/gpdb,ahachete/gpdb,lintzc/gpdb,adam8157/gpdb,50wu/gpdb,atris/gpdb,Quikling/gpdb,zeroae/postgres-xl,kmjungersen/PostgresXL,lpetrov-pivotal/gpdb,pavanvd/postgres-xl,randomtask1155/gpdb,adam8157/gpdb,oberstet/postgres-xl,Chibin/gpdb,techdragon/Postgres-XL,zaksoup/gpdb,greenplum-db/gpdb,tangp3/gpdb,kaknikhil/gpdb,chrishajas/gpdb,postmind-net/postgres-xl,xinzweb/gpdb,adam8157/gpdb,Quikling/gpdb,greenplum-db/gpdb,Chibin/gpdb,Quikling/gpdb,greenplum-db/gpdb,cjcjameson/gpdb,janebeckman/gpdb,lpetrov-pivotal/gpdb,chrishajas/gpdb,50wu/gpdb,rvs/gpdb,ashwinstar/gpdb,techdragon/Postgres-XL,jmcatamney/gpdb,janebeckman/gpdb,atris/gpdb,Postgres-XL/Postgres-XL,zeroae/postgres-xl,Chibin/gpdb,adam8157/gpdb,rvs/gpdb,yuanzhao/gpdb,rvs/gpdb,lpetrov-pivotal/gpdb,cjcjameson/gpdb,oberstet/postgres-xl,xuegang/gpdb,zaksoup/gpdb,kaknikhil/gpdb,oberstet/postgres-xl,kaknikhil/gpdb,arcivanov/postgres-xl,greenplum-db/gpdb,tpostgres-projects/tPostgres,zaksoup/gpdb,rubikloud/gpdb,kaknikhil/gpdb,0x0FFF/gpdb,rubikloud/gpdb,Quikling/gpdb,chrishajas/gpdb,lintzc/gpdb,edespino/gpdb,rubikloud/gpdb,foyzur/gpdb,50wu/gpdb,zaksoup/gpdb,ahachete/gpdb,ovr/postgres-xl,techdragon/Postgres-XL,tangp3/gpdb,tangp3/gpdb,tangp3/gpdb,postmind-net/postgres-xl,ovr/postgres-xl,yuanzhao/gpdb,royc1/gpdb,arcivanov/postgres-xl,janebeckman/gpdb,edespino/gpdb,yuanzhao/gpdb,cjcjameson/gpdb,tpostgres-projects/tPostgres,janebeckman/gpdb,lintzc/gpdb,edespino/gpdb,edespino/gpdb,xinzweb/gpdb,chrishajas/gpdb,rvs/gpdb,arcivanov/postgres-xl,Quikling/gpdb,atris/gpdb,lintzc/gpdb,0x0FFF/gpdb,zaksoup/gpdb,arcivanov/postgres-xl,jmcatamney/gpdb,xinzweb/gpdb,yazun/postgres-xl,jmcatamney/gpdb,snaga/postgres-xl,Chibin/gpdb,cjcjameson/gpdb,edespino/gpdb,greenplum-db/gpdb,techdragon/Postgres-XL,jmcatamney/gpdb,ashwinstar/gpdb,yuanzhao/gpdb,ovr/postgres-xl,kmjungersen/PostgresXL,royc1/gpdb,royc1/gpdb,CraigHarris/gpdb,adam8157/gpdb,yuanzhao/gpdb,kaknikhil/gpdb,lintzc/gpdb,yazun/postgres-xl,tpostgres-projects/tPostgres,royc1/gpdb,postmind-net/postgres-xl,lpetrov-pivotal/gpdb,edespino/gpdb,snaga/postgres-xl,zeroae/postgres-xl,50wu/gpdb,royc1/gpdb,tangp3/gpdb,ahachete/gpdb,ovr/postgres-xl,pavanvd/postgres-xl,foyzur/gpdb,tangp3/gpdb,jmcatamney/gpdb,jmcatamney/gpdb,yuanzhao/gpdb,edespino/gpdb,zaksoup/gpdb,rvs/gpdb,yuanzhao/gpdb,kaknikhil/gpdb,randomtask1155/gpdb,edespino/gpdb,chrishajas/gpdb,tangp3/gpdb,randomtask1155/gpdb,ashwinstar/gpdb,cjcjameson/gpdb,janebeckman/gpdb,zaksoup/gpdb,CraigHarris/gpdb,Postgres-XL/Postgres-XL,janebeckman/gpdb,rubikloud/gpdb,lisakowen/gpdb,0x0FFF/gpdb,ovr/postgres-xl,yuanzhao/gpdb,chrishajas/gpdb,Quikling/gpdb,xinzweb/gpdb,50wu/gpdb,rubikloud/gpdb,rvs/gpdb,kaknikhil/gpdb,snaga/postgres-xl,xinzweb/gpdb,lisakowen/gpdb