Fix invalid use of #if within a macro, per Laurenz Albe.  Also try to make the LDAP code's error messages look like they were written by someone who had heard of our style guidelines.
Fix invalid use of #if within a macro, per Laurenz Albe.  Also try to
make the LDAP code's error messages look like they were written by someone
who had heard of our style guidelines.

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