The attached patch fixes win32.mak which got broken by the Multibyte mod :-(, and tidies it up a little as well.
The attached patch fixes win32.mak which got broken by the Multibyte mod
:-(, and tidies it up a little as well.

Regards, Dave.

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